From e396345058e8f6d58475ac483d47d154d2f9fa76 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Thu, 9 Mar 2023 22:06:56 -0500
Subject: [PATCH] code refactoring (#1141)

* code refactoring

* allow decimal numbers (such as 0.1) in addition to integers

* adjust password menu
---
 ct/adguard-v5.sh              | 329 +++++++++++++++++--------------
 ct/alpine-v5.sh               | 328 +++++++++++++++++--------------
 ct/alpine-vaultwarden-v5.sh   | 328 +++++++++++++++++--------------
 ct/archlinux-v5.sh            | 330 +++++++++++++++++--------------
 ct/audiobookshelf-v5.sh       | 330 +++++++++++++++++--------------
 ct/autobrr-v5.sh              | 330 +++++++++++++++++--------------
 ct/blocky-v5.sh               | 330 +++++++++++++++++--------------
 ct/casaos-v5.sh               | 359 ++++++++++++++++++----------------
 ct/changedetection-v5.sh      | 330 +++++++++++++++++--------------
 ct/cronicle-v5.sh             | 330 +++++++++++++++++--------------
 ct/daemonsync-v5.sh           | 330 +++++++++++++++++--------------
 ct/dashy-v5.sh                | 330 +++++++++++++++++--------------
 ct/debian-v5.sh               | 330 +++++++++++++++++--------------
 ct/deconz-v5.sh               | 334 +++++++++++++++++--------------
 ct/deluge-v5.sh               | 330 +++++++++++++++++--------------
 ct/devuan-v5.sh               | 330 +++++++++++++++++--------------
 ct/docker-v5.sh               | 345 +++++++++++++++++---------------
 ct/emby-v5.sh                 | 341 +++++++++++++++++---------------
 ct/emqx-v5.sh                 | 330 +++++++++++++++++--------------
 ct/esphome-v5.sh              | 331 +++++++++++++++++--------------
 ct/go2rtc-v5.sh               | 330 +++++++++++++++++--------------
 ct/grafana-v5.sh              | 330 +++++++++++++++++--------------
 ct/grocy-v5.sh                | 330 +++++++++++++++++--------------
 ct/heimdalldashboard-v5.sh    | 330 +++++++++++++++++--------------
 ct/homeassistant-core-v5.sh   | 328 +++++++++++++++++--------------
 ct/homeassistant-v5.sh        | 344 +++++++++++++++++---------------
 ct/homebridge-v5.sh           | 330 +++++++++++++++++--------------
 ct/homepage-v5.sh             | 330 +++++++++++++++++--------------
 ct/homer-v5.sh                | 330 +++++++++++++++++--------------
 ct/hyperion-v5.sh             | 334 +++++++++++++++++--------------
 ct/influxdb-v5.sh             | 330 +++++++++++++++++--------------
 ct/iobroker-v5.sh             | 330 +++++++++++++++++--------------
 ct/jackett-v5.sh              | 330 +++++++++++++++++--------------
 ct/jellyfin-v5.sh             | 342 +++++++++++++++++---------------
 ct/k0s-v5.sh                  | 330 +++++++++++++++++--------------
 ct/kavita-v5.sh               | 330 +++++++++++++++++--------------
 ct/keycloak-v5.sh             | 330 +++++++++++++++++--------------
 ct/lidarr-v5.sh               | 330 +++++++++++++++++--------------
 ct/magicmirror-v5.sh          | 330 +++++++++++++++++--------------
 ct/mariadb-v5.sh              | 330 +++++++++++++++++--------------
 ct/meshcentral-v5.sh          | 330 +++++++++++++++++--------------
 ct/motioneye-v5.sh            | 330 +++++++++++++++++--------------
 ct/mqtt-v5.sh                 | 329 +++++++++++++++++--------------
 ct/n8n-v5.sh                  | 330 +++++++++++++++++--------------
 ct/navidrome-v5.sh            | 330 +++++++++++++++++--------------
 ct/nextcloudpi-v5.sh          | 334 +++++++++++++++++--------------
 ct/nginxproxymanager-v5.sh    | 330 +++++++++++++++++--------------
 ct/nocodb-v5.sh               | 330 +++++++++++++++++--------------
 ct/node-red-v5.sh             | 331 +++++++++++++++++--------------
 ct/omada-v5.sh                | 341 +++++++++++++++++---------------
 ct/omv-v5.sh                  | 334 +++++++++++++++++--------------
 ct/openhab-v5.sh              | 330 +++++++++++++++++--------------
 ct/paperless-ngx-v5.sh        | 331 +++++++++++++++++--------------
 ct/photoprism-v5.sh           | 330 +++++++++++++++++--------------
 ct/pihole-v5.sh               | 330 +++++++++++++++++--------------
 ct/plex-v5.sh                 | 342 +++++++++++++++++---------------
 ct/podman-homeassistant-v5.sh | 330 +++++++++++++++++--------------
 ct/podman-v5.sh               | 330 +++++++++++++++++--------------
 ct/postgresql-v5.sh           | 330 +++++++++++++++++--------------
 ct/prometheus-v5.sh           | 330 +++++++++++++++++--------------
 ct/prowlarr-v5.sh             | 330 +++++++++++++++++--------------
 ct/qbittorrent-v5.sh          | 330 +++++++++++++++++--------------
 ct/radarr-v5.sh               | 330 +++++++++++++++++--------------
 ct/readarr-v5.sh              | 330 +++++++++++++++++--------------
 ct/rockylinux-v5.sh           |  10 +-
 ct/rstptoweb-v5.sh            | 330 +++++++++++++++++--------------
 ct/sabnzbd-v5.sh              | 330 +++++++++++++++++--------------
 ct/scrypted-v5.sh             | 330 +++++++++++++++++--------------
 ct/shinobi-v5.sh              | 342 +++++++++++++++++---------------
 ct/sonarr-v5.sh               | 330 +++++++++++++++++--------------
 ct/syncthing-v5.sh            | 330 +++++++++++++++++--------------
 ct/tdarr-v5.sh                | 330 +++++++++++++++++--------------
 ct/technitiumdns-v5.sh        | 330 +++++++++++++++++--------------
 ct/transmission-v5.sh         | 330 +++++++++++++++++--------------
 ct/trilium-v5.sh              | 330 +++++++++++++++++--------------
 ct/ubuntu-v5.sh               | 342 +++++++++++++++++---------------
 ct/umbrel-v5.sh               | 345 +++++++++++++++++---------------
 ct/unifi-v5.sh                | 330 +++++++++++++++++--------------
 ct/uptimekuma-v5.sh           | 330 +++++++++++++++++--------------
 ct/vaultwarden-v5.sh          | 329 +++++++++++++++++--------------
 ct/whisparr-v5.sh             | 330 +++++++++++++++++--------------
 ct/whoogle-v5.sh              | 330 +++++++++++++++++--------------
 ct/wikijs-v5.sh               | 330 +++++++++++++++++--------------
 ct/wireguard-v5.sh            | 330 +++++++++++++++++--------------
 ct/yunohost-v5.sh             | 330 +++++++++++++++++--------------
 ct/zigbee2mqtt-v5.sh          | 331 +++++++++++++++++--------------
 ct/zwave-js-ui-v5.sh          | 331 +++++++++++++++++--------------
 87 files changed, 15659 insertions(+), 12886 deletions(-)

diff --git a/ct/adguard-v5.sh b/ct/adguard-v5.sh
index b642f680..73a5eb9c 100644
--- a/ct/adguard-v5.sh
+++ b/ct/adguard-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,186 +123,217 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
 
 function install_script() {
diff --git a/ct/alpine-v5.sh b/ct/alpine-v5.sh
index 349f840f..6357beb8 100644
--- a/ct/alpine-v5.sh
+++ b/ct/alpine-v5.sh
@@ -29,7 +29,7 @@ var_version="3.17"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,183 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="alpine" PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    fi
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/alpine-vaultwarden-v5.sh b/ct/alpine-vaultwarden-v5.sh
index 37f11493..644f43da 100644
--- a/ct/alpine-vaultwarden-v5.sh
+++ b/ct/alpine-vaultwarden-v5.sh
@@ -28,7 +28,7 @@ var_version="3.17"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,183 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="alpine" PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    fi
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/archlinux-v5.sh b/ct/archlinux-v5.sh
index 69b82639..26385a0a 100644
--- a/ct/archlinux-v5.sh
+++ b/ct/archlinux-v5.sh
@@ -28,7 +28,7 @@ var_version="base"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="archlinux" PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/audiobookshelf-v5.sh b/ct/audiobookshelf-v5.sh
index a9790f62..ca4e5c9b 100644
--- a/ct/audiobookshelf-v5.sh
+++ b/ct/audiobookshelf-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" OFF \
     "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/autobrr-v5.sh b/ct/autobrr-v5.sh
index 36f1d9b2..b0ad08cc 100644
--- a/ct/autobrr-v5.sh
+++ b/ct/autobrr-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/blocky-v5.sh b/ct/blocky-v5.sh
index cbbb49ff..64b905d2 100644
--- a/ct/blocky-v5.sh
+++ b/ct/blocky-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/casaos-v5.sh b/ct/casaos-v5.sh
index ee8ab94a..074c4065 100644
--- a/ct/casaos-v5.sh
+++ b/ct/casaos-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -124,209 +124,226 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 8 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
-      echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}Yes${CL}"
-      FUSE="yes"
-  else
-      echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}No${CL}"
-      FUSE="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
+    FUSE="yes"
+else
+    FUSE="no"
+fi
+    echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}$FUSE${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
-}
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
+fi
 }
+
 function update_script() {
 header_info
 msg_info "Updating ${APP} LXC"
diff --git a/ct/changedetection-v5.sh b/ct/changedetection-v5.sh
index 7283f909..64899ce7 100644
--- a/ct/changedetection-v5.sh
+++ b/ct/changedetection-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/cronicle-v5.sh b/ct/cronicle-v5.sh
index 06918b55..c3c5069e 100644
--- a/ct/cronicle-v5.sh
+++ b/ct/cronicle-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/daemonsync-v5.sh b/ct/daemonsync-v5.sh
index aa53ad77..bb50f147 100644
--- a/ct/daemonsync-v5.sh
+++ b/ct/daemonsync-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/dashy-v5.sh b/ct/dashy-v5.sh
index 6a8c85b2..0b63ea64 100644
--- a/ct/dashy-v5.sh
+++ b/ct/dashy-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/debian-v5.sh b/ct/debian-v5.sh
index 54cc5976..b0c885f4 100644
--- a/ct/debian-v5.sh
+++ b/ct/debian-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/deconz-v5.sh b/ct/deconz-v5.sh
index 86fda9a6..cdeb7a75 100644
--- a/ct/deconz-v5.sh
+++ b/ct/deconz-v5.sh
@@ -28,7 +28,7 @@ var_version="20.04"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" OFF \
-    "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+    "1" "Unprivileged" ON \
+    "0" "Privileged" OFF \
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/deluge-v5.sh b/ct/deluge-v5.sh
index 11d82a66..7d95aa64 100644
--- a/ct/deluge-v5.sh
+++ b/ct/deluge-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/devuan-v5.sh b/ct/devuan-v5.sh
index 2b124e54..ac845530 100644
--- a/ct/devuan-v5.sh
+++ b/ct/devuan-v5.sh
@@ -28,7 +28,7 @@ var_version="4.0"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password" 8 58 $NSAPP --title "ROOT PASSWORD" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="$NSAPP" PW="-password $NSAPP"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/docker-v5.sh b/ct/docker-v5.sh
index e0f39952..677398a0 100644
--- a/ct/docker-v5.sh
+++ b/ct/docker-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -124,194 +124,226 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
-      echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}Yes${CL}"
-      FUSE="yes"
-  else
-      echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}No${CL}"
-      FUSE="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
+    FUSE="yes"
+else
+    FUSE="no"
+fi
+    echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}$FUSE${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -327,6 +359,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 header_info
 msg_info "Updating ${APP} LXC"
diff --git a/ct/emby-v5.sh b/ct/emby-v5.sh
index ec6c54f5..d138f812 100644
--- a/ct/emby-v5.sh
+++ b/ct/emby-v5.sh
@@ -28,7 +28,7 @@ var_version="20.04"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,195 +123,229 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 11 58 4 \
+if var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
     "18.04" "Bionic" OFF \
     "20.04" "Focal" ON \
     "22.04" "Jammy" OFF \
     "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"; fi
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+    3>&1 1>&2 2>&3); then
+    echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"
+else
+    exit-script
+fi
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" OFF \
     "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -327,6 +361,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 header_info
 LATEST=$(curl -sL https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest | grep '"tag_name":' | cut -d'"' -f4)
diff --git a/ct/emqx-v5.sh b/ct/emqx-v5.sh
index 22f05ffc..45bbd9fa 100644
--- a/ct/emqx-v5.sh
+++ b/ct/emqx-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/esphome-v5.sh b/ct/esphome-v5.sh
index e75e9f07..5cb1c4f2 100644
--- a/ct/esphome-v5.sh
+++ b/ct/esphome-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -318,6 +350,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 header_info
 msg_info "Stopping ESPHome"
diff --git a/ct/go2rtc-v5.sh b/ct/go2rtc-v5.sh
index 11af6313..cf95a685 100644
--- a/ct/go2rtc-v5.sh
+++ b/ct/go2rtc-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/grafana-v5.sh b/ct/grafana-v5.sh
index ccddc65d..2984483f 100644
--- a/ct/grafana-v5.sh
+++ b/ct/grafana-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/grocy-v5.sh b/ct/grocy-v5.sh
index 02944358..ca85cf3f 100644
--- a/ct/grocy-v5.sh
+++ b/ct/grocy-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/heimdalldashboard-v5.sh b/ct/heimdalldashboard-v5.sh
index b09170c6..8853bb2b 100644
--- a/ct/heimdalldashboard-v5.sh
+++ b/ct/heimdalldashboard-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/homeassistant-core-v5.sh b/ct/homeassistant-core-v5.sh
index 81ac9bb9..988b31df 100644
--- a/ct/homeassistant-core-v5.sh
+++ b/ct/homeassistant-core-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -125,186 +125,216 @@ function default_settings() {
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
 
 function install_script() {
diff --git a/ct/homeassistant-v5.sh b/ct/homeassistant-v5.sh
index da4c31ed..391f8080 100644
--- a/ct/homeassistant-v5.sh
+++ b/ct/homeassistant-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -125,194 +125,225 @@ function default_settings() {
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
-      echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}Yes${CL}"
-      FUSE="yes"
-  else
-      echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}No${CL}"
-      FUSE="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
+    FUSE="yes"
+else
+    FUSE="no"
+fi
+    echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}$FUSE${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -328,6 +359,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
   UPD=$(whiptail --title "UPDATE" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 4 \
   "1" "Update ALL Containers" ON \
diff --git a/ct/homebridge-v5.sh b/ct/homebridge-v5.sh
index e77dbc51..955813c7 100644
--- a/ct/homebridge-v5.sh
+++ b/ct/homebridge-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/homepage-v5.sh b/ct/homepage-v5.sh
index 32bc3745..cc799cb4 100644
--- a/ct/homepage-v5.sh
+++ b/ct/homepage-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/homer-v5.sh b/ct/homer-v5.sh
index bca46fb8..c99f3a70 100644
--- a/ct/homer-v5.sh
+++ b/ct/homer-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/hyperion-v5.sh b/ct/hyperion-v5.sh
index f57f81b0..13e1168c 100644
--- a/ct/hyperion-v5.sh
+++ b/ct/hyperion-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" OFF \
-    "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+    "1" "Unprivileged" ON \
+    "0" "Privileged" OFF \
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/influxdb-v5.sh b/ct/influxdb-v5.sh
index 7306046c..3f1e42ed 100644
--- a/ct/influxdb-v5.sh
+++ b/ct/influxdb-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/iobroker-v5.sh b/ct/iobroker-v5.sh
index 77e5a5e8..7e74a9f4 100644
--- a/ct/iobroker-v5.sh
+++ b/ct/iobroker-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/jackett-v5.sh b/ct/jackett-v5.sh
index 485c97cf..72a6a925 100644
--- a/ct/jackett-v5.sh
+++ b/ct/jackett-v5.sh
@@ -27,7 +27,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -121,187 +121,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/jellyfin-v5.sh b/ct/jellyfin-v5.sh
index d124f71a..b043cf38 100644
--- a/ct/jellyfin-v5.sh
+++ b/ct/jellyfin-v5.sh
@@ -29,7 +29,7 @@ var_version="20.04"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -86,7 +86,6 @@ fi
 
 function default_settings() {
   echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}"
-
   echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
   CT_TYPE="0"
   echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
@@ -125,195 +124,229 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 11 58 4 \
+if var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
     "18.04" "Bionic" OFF \
     "20.04" "Focal" ON \
     "22.04" "Jammy" OFF \
     "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"; fi
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+    3>&1 1>&2 2>&3); then
+    echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"
+else
+    exit-script
+fi
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" OFF \
     "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -329,6 +362,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 header_info
 msg_info "Updating ${APP} LXC"
diff --git a/ct/k0s-v5.sh b/ct/k0s-v5.sh
index 510c5aba..cdf959f6 100644
--- a/ct/k0s-v5.sh
+++ b/ct/k0s-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/kavita-v5.sh b/ct/kavita-v5.sh
index d2a0aee0..32c7b540 100644
--- a/ct/kavita-v5.sh
+++ b/ct/kavita-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/keycloak-v5.sh b/ct/keycloak-v5.sh
index 65043f38..7c2d8149 100644
--- a/ct/keycloak-v5.sh
+++ b/ct/keycloak-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/lidarr-v5.sh b/ct/lidarr-v5.sh
index c5973a74..2fa8eab1 100644
--- a/ct/lidarr-v5.sh
+++ b/ct/lidarr-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/magicmirror-v5.sh b/ct/magicmirror-v5.sh
index 8da28b49..87f20b9a 100644
--- a/ct/magicmirror-v5.sh
+++ b/ct/magicmirror-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/mariadb-v5.sh b/ct/mariadb-v5.sh
index ca18035a..2bee684d 100644
--- a/ct/mariadb-v5.sh
+++ b/ct/mariadb-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/meshcentral-v5.sh b/ct/meshcentral-v5.sh
index be017202..0899b146 100644
--- a/ct/meshcentral-v5.sh
+++ b/ct/meshcentral-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/motioneye-v5.sh b/ct/motioneye-v5.sh
index 907f9182..245f2439 100644
--- a/ct/motioneye-v5.sh
+++ b/ct/motioneye-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/mqtt-v5.sh b/ct/mqtt-v5.sh
index e16e0acd..46cfed5f 100644
--- a/ct/mqtt-v5.sh
+++ b/ct/mqtt-v5.sh
@@ -27,7 +27,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -121,186 +121,217 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
 
 function install_script() {
diff --git a/ct/n8n-v5.sh b/ct/n8n-v5.sh
index 046c20c7..13184630 100644
--- a/ct/n8n-v5.sh
+++ b/ct/n8n-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/navidrome-v5.sh b/ct/navidrome-v5.sh
index 99606d17..c5d4eeb2 100644
--- a/ct/navidrome-v5.sh
+++ b/ct/navidrome-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/nextcloudpi-v5.sh b/ct/nextcloudpi-v5.sh
index 4087e191..79ad1cff 100644
--- a/ct/nextcloudpi-v5.sh
+++ b/ct/nextcloudpi-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" OFF \
-    "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+    "1" "Unprivileged" ON \
+    "0" "Privileged" OFF \
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/nginxproxymanager-v5.sh b/ct/nginxproxymanager-v5.sh
index e2a6f421..1d22c093 100644
--- a/ct/nginxproxymanager-v5.sh
+++ b/ct/nginxproxymanager-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/nocodb-v5.sh b/ct/nocodb-v5.sh
index 7f5cc1b4..50b929cb 100644
--- a/ct/nocodb-v5.sh
+++ b/ct/nocodb-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/node-red-v5.sh b/ct/node-red-v5.sh
index 6fae8624..e0a5fbf4 100644
--- a/ct/node-red-v5.sh
+++ b/ct/node-red-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -318,6 +350,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 UPD=$(whiptail --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 2 \
   "1" "Update ${APP}" ON \
diff --git a/ct/omada-v5.sh b/ct/omada-v5.sh
index e3b04bc1..c9b9defc 100644
--- a/ct/omada-v5.sh
+++ b/ct/omada-v5.sh
@@ -28,7 +28,7 @@ var_version="20.04"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,195 +123,230 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 11 58 4 \
+if var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
     "18.04" "Bionic" OFF \
     "20.04" "Focal" ON \
     "22.04" "Jammy" OFF \
     "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"; fi
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+    3>&1 1>&2 2>&3); then
+    echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"
+else
+    exit-script
+fi
+
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/omv-v5.sh b/ct/omv-v5.sh
index 542c9fa3..692f323b 100644
--- a/ct/omv-v5.sh
+++ b/ct/omv-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" OFF \
-    "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+    "1" "Unprivileged" ON \
+    "0" "Privileged" OFF \
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/openhab-v5.sh b/ct/openhab-v5.sh
index 23f0c177..45150c44 100644
--- a/ct/openhab-v5.sh
+++ b/ct/openhab-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/paperless-ngx-v5.sh b/ct/paperless-ngx-v5.sh
index 4ffeb59a..88b62649 100644
--- a/ct/paperless-ngx-v5.sh
+++ b/ct/paperless-ngx-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -319,6 +351,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 RELEASE=$(curl -s https://api.github.com/repos/paperless-ngx/paperless-ngx/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
 SER=/etc/systemd/system/paperless-task-queue.service
diff --git a/ct/photoprism-v5.sh b/ct/photoprism-v5.sh
index d182a728..f128744e 100644
--- a/ct/photoprism-v5.sh
+++ b/ct/photoprism-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/pihole-v5.sh b/ct/pihole-v5.sh
index 486e2d28..f4e541af 100644
--- a/ct/pihole-v5.sh
+++ b/ct/pihole-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/plex-v5.sh b/ct/plex-v5.sh
index 62243b55..a1d4b466 100644
--- a/ct/plex-v5.sh
+++ b/ct/plex-v5.sh
@@ -28,7 +28,7 @@ var_version="20.04"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -85,7 +85,6 @@ fi
 
 function default_settings() {
   echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}"
-
   echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
   CT_TYPE="0"
   echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
@@ -124,195 +123,229 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 11 58 4 \
+if var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
     "18.04" "Bionic" OFF \
     "20.04" "Focal" ON \
     "22.04" "Jammy" OFF \
     "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"; fi
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+    3>&1 1>&2 2>&3); then
+    echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"
+else
+    exit-script
+fi
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" OFF \
     "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -328,6 +361,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 UPD=$(whiptail --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select \nplexupdate info >> https://github.com/mrworf/plexupdate" 10 59 2 \
   "1" "Update LXC" ON \
diff --git a/ct/podman-homeassistant-v5.sh b/ct/podman-homeassistant-v5.sh
index 9553f229..daba5aec 100644
--- a/ct/podman-homeassistant-v5.sh
+++ b/ct/podman-homeassistant-v5.sh
@@ -32,7 +32,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -126,187 +126,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/podman-v5.sh b/ct/podman-v5.sh
index a388ea5f..582e0831 100644
--- a/ct/podman-v5.sh
+++ b/ct/podman-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/postgresql-v5.sh b/ct/postgresql-v5.sh
index d8072ccf..47a66cf8 100644
--- a/ct/postgresql-v5.sh
+++ b/ct/postgresql-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/prometheus-v5.sh b/ct/prometheus-v5.sh
index d0977b6c..34856e1a 100644
--- a/ct/prometheus-v5.sh
+++ b/ct/prometheus-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/prowlarr-v5.sh b/ct/prowlarr-v5.sh
index e73b7249..758bf5a3 100644
--- a/ct/prowlarr-v5.sh
+++ b/ct/prowlarr-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/qbittorrent-v5.sh b/ct/qbittorrent-v5.sh
index 5eb36c37..b52a8f49 100644
--- a/ct/qbittorrent-v5.sh
+++ b/ct/qbittorrent-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/radarr-v5.sh b/ct/radarr-v5.sh
index cf7cf23f..e9eb9667 100644
--- a/ct/radarr-v5.sh
+++ b/ct/radarr-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/readarr-v5.sh b/ct/readarr-v5.sh
index 4b32964c..4d555119 100644
--- a/ct/readarr-v5.sh
+++ b/ct/readarr-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/rockylinux-v5.sh b/ct/rockylinux-v5.sh
index 96f1f30e..e13fcb60 100644
--- a/ct/rockylinux-v5.sh
+++ b/ct/rockylinux-v5.sh
@@ -29,7 +29,7 @@ var_version="9"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,6 +123,13 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
   CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
@@ -304,6 +311,7 @@ function advanced_settings() {
     advanced_settings
   fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/rstptoweb-v5.sh b/ct/rstptoweb-v5.sh
index e0bebee4..803d52c9 100644
--- a/ct/rstptoweb-v5.sh
+++ b/ct/rstptoweb-v5.sh
@@ -27,7 +27,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -121,187 +121,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/sabnzbd-v5.sh b/ct/sabnzbd-v5.sh
index a3f9457d..a0f77356 100644
--- a/ct/sabnzbd-v5.sh
+++ b/ct/sabnzbd-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/scrypted-v5.sh b/ct/scrypted-v5.sh
index 1021fd8c..25867b90 100644
--- a/ct/scrypted-v5.sh
+++ b/ct/scrypted-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/shinobi-v5.sh b/ct/shinobi-v5.sh
index f2411855..c2c2a019 100644
--- a/ct/shinobi-v5.sh
+++ b/ct/shinobi-v5.sh
@@ -28,7 +28,7 @@ var_version="22.04"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,195 +123,230 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+if var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
     "18.04" "Bionic" OFF \
     "20.04" "Focal" OFF \
     "22.04" "Jammy" ON \
     "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"; fi
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+    3>&1 1>&2 2>&3); then
+    echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"
+else
+    exit-script
+fi
+
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -327,6 +362,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 header_info
 msg_info "Updating Shinobi LXC"
diff --git a/ct/sonarr-v5.sh b/ct/sonarr-v5.sh
index f7f6d4b3..6018fcc2 100644
--- a/ct/sonarr-v5.sh
+++ b/ct/sonarr-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/syncthing-v5.sh b/ct/syncthing-v5.sh
index 780653b1..0f88a88d 100644
--- a/ct/syncthing-v5.sh
+++ b/ct/syncthing-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/tdarr-v5.sh b/ct/tdarr-v5.sh
index d15c5de0..4a879ece 100644
--- a/ct/tdarr-v5.sh
+++ b/ct/tdarr-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/technitiumdns-v5.sh b/ct/technitiumdns-v5.sh
index 6927ee63..44b424f3 100644
--- a/ct/technitiumdns-v5.sh
+++ b/ct/technitiumdns-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/transmission-v5.sh b/ct/transmission-v5.sh
index a7aad0ce..5fb1e37d 100644
--- a/ct/transmission-v5.sh
+++ b/ct/transmission-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/trilium-v5.sh b/ct/trilium-v5.sh
index 688a2a60..3c447d88 100644
--- a/ct/trilium-v5.sh
+++ b/ct/trilium-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/ubuntu-v5.sh b/ct/ubuntu-v5.sh
index 3a07a06b..79bcc700 100644
--- a/ct/ubuntu-v5.sh
+++ b/ct/ubuntu-v5.sh
@@ -28,7 +28,7 @@ var_version="22.04"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,195 +123,230 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 11 58 4 \
+if var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
     "18.04" "Bionic" OFF \
     "20.04" "Focal" OFF \
     "22.04" "Jammy" ON \
     "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"; fi
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+    3>&1 1>&2 2>&3); then
+    echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"
+else
+    exit-script
+fi
+
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -327,6 +362,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 header_info
 msg_info "Updating ${APP} LXC"
diff --git a/ct/umbrel-v5.sh b/ct/umbrel-v5.sh
index 6adff888..ee339e2b 100644
--- a/ct/umbrel-v5.sh
+++ b/ct/umbrel-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -124,194 +124,226 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
-      echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}Yes${CL}"
-      FUSE="yes"
-  else
-      echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}No${CL}"
-      FUSE="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
+    FUSE="yes"
+else
+    FUSE="no"
+fi
+    echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}$FUSE${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -327,6 +359,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 header_info
 msg_info "Updating ${APP} LXC"
diff --git a/ct/unifi-v5.sh b/ct/unifi-v5.sh
index 2b299529..571c30fb 100644
--- a/ct/unifi-v5.sh
+++ b/ct/unifi-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/uptimekuma-v5.sh b/ct/uptimekuma-v5.sh
index ad5cc724..09623497 100644
--- a/ct/uptimekuma-v5.sh
+++ b/ct/uptimekuma-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/vaultwarden-v5.sh b/ct/vaultwarden-v5.sh
index 055e893d..bda9fadf 100644
--- a/ct/vaultwarden-v5.sh
+++ b/ct/vaultwarden-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,218 @@ function default_settings() {
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/whisparr-v5.sh b/ct/whisparr-v5.sh
index 1f51216c..21b45677 100644
--- a/ct/whisparr-v5.sh
+++ b/ct/whisparr-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/whoogle-v5.sh b/ct/whoogle-v5.sh
index 93fc469b..ec26eadb 100644
--- a/ct/whoogle-v5.sh
+++ b/ct/whoogle-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/wikijs-v5.sh b/ct/wikijs-v5.sh
index 685f8783..3848eb4c 100644
--- a/ct/wikijs-v5.sh
+++ b/ct/wikijs-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/wireguard-v5.sh b/ct/wireguard-v5.sh
index cc16fabd..8fce1701 100644
--- a/ct/wireguard-v5.sh
+++ b/ct/wireguard-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/yunohost-v5.sh b/ct/yunohost-v5.sh
index 52629130..6d324d78 100644
--- a/ct/yunohost-v5.sh
+++ b/ct/yunohost-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" ON \
     "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
diff --git a/ct/zigbee2mqtt-v5.sh b/ct/zigbee2mqtt-v5.sh
index 53543482..f16cc025 100644
--- a/ct/zigbee2mqtt-v5.sh
+++ b/ct/zigbee2mqtt-v5.sh
@@ -29,7 +29,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -123,187 +123,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" OFF \
     "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -319,6 +351,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 header_info
 cd /opt/zigbee2mqtt
diff --git a/ct/zwave-js-ui-v5.sh b/ct/zwave-js-ui-v5.sh
index 510cb5fc..c4f360a6 100644
--- a/ct/zwave-js-ui-v5.sh
+++ b/ct/zwave-js-ui-v5.sh
@@ -28,7 +28,7 @@ var_version="11"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+$'
+INTEGER='^[0-9]+([.][0-9]+)?$'
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
@@ -122,187 +122,219 @@ function default_settings() {
   VERB="no"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
+
+function exit-script() {
+    clear
+    echo -e "⚠  User exited script \n"
+    exit
+}
+
 function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
     "1" "Unprivileged" OFF \
     "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+    3>&1 1>&2 2>&3); then
     echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW1="Automatic Login"
+        PW=" "
     else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+        PW="-password $PW1"
+    fi
+    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+else
+    exit-script
+fi
+
+if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+    else
+        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+    fi
+else
+    exit
+fi
+
+if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+    if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+    else
+        HN=$(echo ${CT_NAME,,} | tr -d ' ')
     fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
     echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+else
+    exit-script
+fi
+
+if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+    if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+        else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
     fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
+else
+    exit-script
+fi
+
+if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+    if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+    else
+        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
     fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+    if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    else
+        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+    fi
+else
+    exit-script
+fi
+
+if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+    if [ -z "$BRG" ]; then
+        BRG="vmbr0"
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    else
+        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+    fi
+else
+    exit-script
+fi
+
+if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+    if [ -z $NET ]; then
+        NET="dhcp"
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    else
+        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+    fi
+else
+    exit-script
+fi
+if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
     if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE1="Default"
+        GATE=""
     else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+        GATE=",gw=$GATE1"
     fi
-  fi
-  if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-      echo -e "${DGN}Disable IPv6: ${BGN}Yes${CL}"
-      DISABLEIP6="yes"
-  else
-      echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-      DISABLEIP6="no"
-  fi
-  MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+    DISABLEIP6="yes"
+else
+    DISABLEIP6="no"
+fi
+    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
-      MTU1="Default" MTU=""
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU1="Default"
+        MTU=""
     else
-      MTU=",mtu=$MTU1"
-      echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+        MTU=",mtu=$MTU1"
     fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+else
+    exit-script
+fi
+
+if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
     if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+        SX=Host
+        SD=""
     else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+        SX=$SD
+        SD="-searchdomain=$SD"
     fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
+        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+else
+    exit-script
+fi
+
+if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+    if [ -z $NX ]; then
+        NX=Host    
+        NS=""
     else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+        NS="-nameserver=$NX"
     fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+else
+    exit-script
+fi
+
+if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC1="Default"
+        MAC=""
     else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+        MAC=",hwaddr=$MAC1"
+        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
     fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
+else
+    exit-script
+fi
+
+if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN1="Default"
+        VLAN=""
     else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+        VLAN=",tag=$VLAN1"
     fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
+        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+else
+    exit-script
+fi
+
+if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+    SSH="yes"
+else
+    SSH="no"
+fi
+    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+    VERB="yes"
+else
+    VERB="no"
+fi
+    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
+else
     clear
     header_info
     echo -e "${RD}Using Advanced Settings${CL}"
     advanced_settings
-  fi
+fi
 }
+
 function install_script() {
 ARCH_CHECK
 PVE_CHECK
@@ -318,6 +350,7 @@ header_info
     advanced_settings
   fi
 }
+
 function update_script() {
 header_info
 RELEASE=$(curl -s https://api.github.com/repos/zwave-js/zwave-js-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')