diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2663e029..acdce9d3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@
 #
 
 # Pull the current golang-alpine image.
-FROM golang:1.27-alpine3.24 AS awg-go
+FROM golang:1.27-alpine3.24 AS awg-go-builder
 
 # Install build-dependencies.
 RUN apk add --no-cache \
@@ -30,7 +30,7 @@ RUN go version && \
 # AWG TOOLS BUILDING STAGE
 # Base: Alpine
 #
-FROM alpine:3.24 AS awg-tools
+FROM alpine:3.24 AS awg-tools-builder
 
 # Install needed dependencies.
 RUN apk add --no-cache \
@@ -121,9 +121,9 @@ RUN apk add --no-cache \
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Copy only the final binaries from the AWG builder stages
-COPY --from=awg-go /usr/bin/amneziawg-go /usr/bin/amneziawg-go
-COPY --from=awg-tools /workspace/awg-tools/src/wg /usr/bin/awg
-COPY --from=awg-tools /workspace/awg-tools/src/wg-quick/linux.bash /usr/bin/awg-quick
+COPY --from=awg-go-builder /usr/bin/amneziawg-go /usr/bin/amneziawg-go
+COPY --from=awg-tools-builder /workspace/awg-tools/src/wg /usr/bin/awg
+COPY --from=awg-tools-builder /workspace/awg-tools/src/wg-quick/linux.bash /usr/bin/awg-quick
 
 # Environment variables
 ARG wg_net="10.0.0.1"
diff --git a/src/requirements.txt b/src/requirements.txt
index 0cbb43a1..4feeeb28 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -13,5 +13,5 @@ sqlalchemy_utils==0.43.0
 psycopg[binary]==3.3.6
 PyMySQL==1.2.3
 tzlocal==5.4.5
-python-jose==3.5.0
+python-jose[cryptography]==3.5.0
 pydantic==2.14.1
diff --git a/src/static/app/package-lock.json b/src/static/app/package-lock.json
index e59f7326..acc88a46 100644
--- a/src/static/app/package-lock.json
+++ b/src/static/app/package-lock.json
@@ -2555,9 +2555,9 @@
       }
     },
     "node_modules/defu": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmmirror.com/defu/-/defu-6.1.4.tgz",
-      "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
+      "version": "6.1.7",
+      "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.7.tgz",
+      "integrity": "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==",
       "license": "MIT"
     },
     "node_modules/delayed-stream": {
@@ -3013,9 +3013,9 @@
       }
     },
     "node_modules/fflate": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
-      "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.3.tgz",
+      "integrity": "sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==",
       "license": "MIT"
     },
     "node_modules/filelist": {
diff --git a/src/static/client/package-lock.json b/src/static/client/package-lock.json
index 53e03454..d8548b16 100644
--- a/src/static/client/package-lock.json
+++ b/src/static/client/package-lock.json
@@ -1242,9 +1242,9 @@
       }
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.34",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.34.tgz",
-      "integrity": "sha512-IMDedajPifLnHNY0X9n8hKxRTQ6/eTHwr5bDo04WnuqxyKw6LYtQywCuuqPZwhl3aBXMvQpJov42GLCwRRdQzw==",
+      "version": "2.11.33",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.33.tgz",
+      "integrity": "sha512-yiVKDX+qCMRKBE084lXvq9EcwFUhKZ2nU8TK1EQQuOgPNR/lmbGxXOeDdlGUqC2Zz11Cs9rk1d/8NfgBmlkt0w==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -1299,9 +1299,9 @@
       "license": "MIT"
     },
     "node_modules/browserslist": {
-      "version": "4.28.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
-      "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
+      "version": "4.29.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.4.tgz",
+      "integrity": "sha512-2TcbbiwXEq+N0kD36tykpCfyyQigUXmuwNQbnPp4Xk4PX9JOqVIKjJlIDjpH7uY6tmRGoAd+apeT1p60T8wsdA==",
       "dev": true,
       "funding": [
         {
@@ -1319,11 +1319,11 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.10.12",
-        "caniuse-lite": "^1.0.30001782",
-        "electron-to-chromium": "^1.5.328",
-        "node-releases": "^2.0.36",
-        "update-browserslist-db": "^1.2.3"
+        "baseline-browser-mapping": "^2.11.29",
+        "caniuse-lite": "^1.0.30001816",
+        "electron-to-chromium": "^1.5.459",
+        "node-releases": "^2.0.59",
+        "update-browserslist-db": "^1.3.4"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -1371,9 +1371,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001793",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz",
-      "integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==",
+      "version": "1.0.30001819",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001819.tgz",
+      "integrity": "sha512-LFUqIIAwpzsIuevnKnsR9qnStBcgzPShTX61lBwN9uFkkf8o8zLiebEjbW8AYtZiF+1YKDWfdt/pWDtMuG8Xwg==",
       "dev": true,
       "funding": [
         {
@@ -1581,9 +1581,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.368",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.368.tgz",
-      "integrity": "sha512-7RckJJK4uESJF9PxvfMWd3TGqIiieUTG4HxnKaKuIpGbcr+r2ZEB3g2gAhCP3Fqm42vJSzLfgab9eva/C4/XVw==",
+      "version": "1.5.464",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.464.tgz",
+      "integrity": "sha512-nRa65aFge40viPAKxMKULIY8tcXKwKboJWNn4RoKwyWXJ6SP7BnrDGKUTzc64818jIciH0PK7LSF8QzZes19GA==",
       "dev": true,
       "license": "ISC"
     },
@@ -1713,9 +1713,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
-      "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.2.tgz",
+      "integrity": "sha512-/kVP2U8z596Ia0gwFrwyIeo74ta5aVmSeU1FfAUMAmcEP5EP7zydmag3SLiN64NaRKef3lxsq7i/g7ltJQDGow==",
       "funding": [
         {
           "type": "individual",
@@ -2431,9 +2431,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.47",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.47.tgz",
-      "integrity": "sha512-Uzmd6LXpouKo8EUK68IjH4+E01w/hXyV3R3g/geCJo+rXLNfh1xucB+LOzYEOQPSiUK3h/xZf0cQGcSsmyL2Og==",
+      "version": "2.0.60",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.60.tgz",
+      "integrity": "sha512-OmO8+GM1JUZqXET720VrJCwkjUCXmCMQm0Z3UDDRbfNLHS4NEAvY60j5jiFv0tkKw2PNNlqOLhahVmwJIOLDIQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2928,9 +2928,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
-      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.4.tgz",
+      "integrity": "sha512-t8wonIOdQyOjtPd2VktlBu6QjTVTks6v8bSi7kd0r2Vll8TK1JYDZtRRdbmCHOAMphkZgrzK+L+vXK4pyZ8t4A==",
       "dev": true,
       "funding": [
         {
diff --git a/src/wgd.sh b/src/wgd.sh
index 9736d7cc..39f67ef8 100755
--- a/src/wgd.sh
+++ b/src/wgd.sh
@@ -5,12 +5,17 @@
 #trap "kill $TOP_PID"
 export TOP_PID=$$
 
+#------------------------------------------------------------------------------
+# Configuration
+#------------------------------------------------------------------------------
 app_name="dashboard.py"
 app_official_name="WGDashboard"
 venv_python="./venv/bin/python3"
 venv_gunicorn="./venv/bin/gunicorn"
 pythonExecutable="python3"
 
+frontend_dirs=("./static/app" "./static/client")
+
 heavy_checkmark=$(printf "\xE2\x9C\x85")
 heavy_crossmark=$(printf "\xE2\x9D\x8C")
 install=$(printf "\xF0\x9F\x92\xBF")
@@ -20,218 +25,308 @@ msleep=15
 PID_FILE=./gunicorn.pid
 environment=$(if [[ $ENVIRONMENT ]]; then echo $ENVIRONMENT; else echo 'develop'; fi)
 if [[ $CONFIGURATION_PATH ]]; then
-  cb_work_dir=$CONFIGURATION_PATH/letsencrypt/work-dir
-  cb_config_dir=$CONFIGURATION_PATH/letsencrypt/config-dir
+    cb_work_dir=$CONFIGURATION_PATH/letsencrypt/work-dir
+    cb_config_dir=$CONFIGURATION_PATH/letsencrypt/config-dir
 else
-  cb_work_dir=/etc/letsencrypt
-  cb_config_dir=/var/lib/letsencrypt
+    cb_work_dir=/etc/letsencrypt
+    cb_config_dir=/var/lib/letsencrypt
 fi
 
 dashes='---------------------------------------------------------------------------------'
 equals='============================================================'
 helpMsg="[WGDashboard] Please check ./log/install.txt for more details. For further assistance, please open a ticket on https://github.com/WGDashboard/WGDashboard/issues/new/choose, I'm more than happy to help :)"
+
+#------------------------------------------------------------------------------
+# Output helpers
+#------------------------------------------------------------------------------
 print_header(){
-	printf "=================================================================================\n"
-	printf "+          <WGDashboard> by Donald Zou - https://github.com/donaldzou           +\n"
-	printf "=================================================================================\n"
+    printf "=================================================================================\n"
+    printf "+          <WGDashboard> by Donald Zou - https://github.com/donaldzou           +\n"
+    printf "=================================================================================\n"
 }
 
 help () {
-  printf "| Usage: ./wgd.sh <option>                                                      |\n"
-  printf "|                                                                               |\n"
-  printf "| Available options:                                                            |\n"
-  printf "|    start: To start WGDashboard.                                               |\n"
-  printf "|    stop: To stop WGDashboard.                                                 |\n"
-  printf "|    debug: To start WGDashboard in debug mode (i.e run in foreground).         |\n"
-  printf "|    update: To update WGDashboard to the newest version from GitHub.           |\n"
-  printf "|    install: To install WGDashboard.                                           |\n"
-  printf "| Thank you for using! Your support is my motivation ;)                         |\n"
-  printf "=================================================================================\n"
+    printf "| Usage: ./wgd.sh <option>                                                      |\n"
+    printf "|                                                                               |\n"
+    printf "| Available options:                                                            |\n"
+    printf "|    start: To start WGDashboard.                                               |\n"
+    printf "|    stop: To stop WGDashboard.                                                 |\n"
+    printf "|    debug: To start WGDashboard in debug mode (i.e run in foreground).         |\n"
+    printf "|    update: To update WGDashboard to the newest version from GitHub.           |\n"
+    printf "|    install: To install WGDashboard.                                           |\n"
+    printf "| Thank you for using! Your support is my motivation ;)                         |\n"
+    printf "=================================================================================\n"
 }
 
+_logSection(){
+    { printf "\n\n [%s] [%s] \n\n" "$1" "$(date)"; } >> ./log/install.txt
+}
+
+_unsupportedOS(){
+    printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark"
+    printf "%s\n" "$helpMsg"
+    kill $TOP_PID
+}
+
+#------------------------------------------------------------------------------
+# Environment detection
+#------------------------------------------------------------------------------
 _check_and_set_venv(){
     VIRTUAL_ENV="./venv"
     if [ ! -d $VIRTUAL_ENV ]; then
-    	printf "[WGDashboard] %s Creating Python Virtual Environment under ./venv\n" "$install"
+        printf "[WGDashboard] %s Creating Python Virtual Environment under ./venv\n" "$install"
         { $pythonExecutable -m venv $VIRTUAL_ENV; } >> ./log/install.txt
     fi
-    
+
     if ! $venv_python --version > /dev/null 2>&1
     then
-    	printf "[WGDashboard] %s Python Virtual Environment under ./venv failed to create. Halting now.\n" "$heavy_crossmark"	
-    	kill $TOP_PID
+        printf "[WGDashboard] %s Python Virtual Environment under ./venv failed to create. Halting now.\n" "$heavy_crossmark"
+        kill $TOP_PID
     fi
-    
+
     . ${VIRTUAL_ENV}/bin/activate
 }
 
 _determineOS(){
-	if [ -f /etc/os-release ]; then
-		. /etc/os-release
-		OS=$ID
-	elif [ -f /etc/redhat-release ]; then
-		OS="redhat"
-	else
-		printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark"
-		printf "%s\n" "$helpMsg"
-		kill  $TOP_PID
-	fi
-	printf "[WGDashboard] OS: %s\n" "$OS"
+    if [ -f /etc/os-release ]; then
+        . /etc/os-release
+        OS=$ID
+    elif [ -f /etc/redhat-release ]; then
+        OS="redhat"
+    else
+        _unsupportedOS
+    fi
+    printf "[WGDashboard] OS: %s\n" "$OS"
 }
 
+#------------------------------------------------------------------------------
+# Python
+#------------------------------------------------------------------------------
 _installPython(){
-	{ printf "\n\n [Installing Python] [%s] \n\n""$(date)"; } >> ./log/install.txt 
-	printf "[WGDashboard] %s Installing Python\n" "$install"
-	case "$OS" in
-		ubuntu|debian|raspbian)
-			{ sudo apt update ; sudo apt-get install -y python3 net-tools; printf "\n\n"; } >> ./log/install.txt 
-		;;
-		centos|fedora|redhat|rhel|almalinux|rocky)
-			if command -v dnf &> /dev/null; then
-				{ sudo dnf install -y python3 net-tools; printf "\n\n"; } >> ./log/install.txt
-			else
-				{ sudo yum install -y python3 net-tools ; printf "\n\n"; } >> ./log/install.txt
-			fi
-		;;
-		alpine)
-			{ sudo apk update; sudo apk add python3 net-tools --no-cache; printf "\n\n"; } &>> ./log/install.txt
-		;;
-		arch)
-			{ sudo pacman -Syu python3 net-tools; printf "\n\n"; } &>> ./log/install.txt
-		;;
-	esac
-	
-	if ! python3 --version > /dev/null 2>&1
-	then
-		printf "[WGDashboard] %s Python is still not installed, halting script now.\n" "$heavy_crossmark"
-		printf "%s\n" "$helpMsg"
-		kill  $TOP_PID
-	else
-		printf "[WGDashboard] %s Python is installed\n" "$heavy_checkmark"
-	fi
+    _logSection "Installing Python"
+    printf "[WGDashboard] %s Installing Python\n" "$install"
+    case "$OS" in
+        ubuntu|debian|raspbian)
+            { sudo apt update ; sudo apt-get install -y python3 net-tools; printf "\n\n"; } >> ./log/install.txt
+        ;;
+        centos|fedora|redhat|rhel|almalinux|rocky)
+            if command -v dnf &> /dev/null; then
+                { sudo dnf install -y python3 net-tools; printf "\n\n"; } >> ./log/install.txt
+            else
+                { sudo yum install -y python3 net-tools ; printf "\n\n"; } >> ./log/install.txt
+            fi
+        ;;
+        alpine)
+            { sudo apk update; sudo apk add python3 net-tools --no-cache; printf "\n\n"; } &>> ./log/install.txt
+        ;;
+        arch)
+            { sudo pacman -Syu python3 net-tools; printf "\n\n"; } &>> ./log/install.txt
+        ;;
+    esac
+
+    if ! python3 --version > /dev/null 2>&1
+    then
+        printf "[WGDashboard] %s Python is still not installed, halting script now.\n" "$heavy_crossmark"
+        printf "%s\n" "$helpMsg"
+        kill $TOP_PID
+    else
+        printf "[WGDashboard] %s Python is installed\n" "$heavy_checkmark"
+    fi
 }
 
 _installPythonVenv(){
-	{ printf "\n\n [Installing Python Venv] [%s] \n\n""$(date)"; } >> ./log/install.txt 
-	printf "[WGDashboard] %s Installing Python Virtual Environment\n" "$install"
-	if [ "$pythonExecutable" = "python3" ]; then
-		case "$OS" in
-			ubuntu|debian|raspbian)
-				{ sudo apt update ; sudo apt-get install -y python3-venv; printf "\n\n"; } &>> ./log/install.txt
-			;;
-			centos|fedora|redhat|rhel|almalinux|rocky)
-				if command -v dnf &> /dev/null; then
-					{ sudo dnf install -y python3-virtualenv; printf "\n\n"; } >> ./log/install.txt
-				else
-					{ sudo yum install -y python3-virtualenv; printf "\n\n"; } >> ./log/install.txt
-				fi
-			;;
-			alpine)
-				{ sudo apk update; sudo apk add py3-virtualenv ; printf "\n\n"; } >> ./log/install.txt
-			;;
-			arch)
-				{ echo "Python Virtual Environment is installed by default from version Python3.3"; printf "\n\n"; } &>> ./log/install.txt # https://wiki.archlinux.org/title/Python/Virtual_environment
-			;;
-			*)
-				printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark"
-				printf "%s\n" "$helpMsg"
-				kill  $TOP_PID
-			;;
-		esac
-	else
-		case "$OS" in
-			ubuntu|debian|raspbian)
-				{ sudo apt-get update; sudo apt-get install ${pythonExecutable}-venv;  } &>> ./log/install.txt
-			;;
-		esac
-	fi
-	
-	if ! $pythonExecutable -m venv -h > /dev/null 2>&1
-	then
-		printf "[WGDashboard] %s Python Virtual Environment is still not installed, halting script now.\n" "$heavy_crossmark"
-		printf "%s\n" "$helpMsg"
-	else
-		printf "[WGDashboard] %s Python Virtual Environment is installed\n" "$heavy_checkmark"
-	fi
+    _logSection "Installing Python Venv"
+    printf "[WGDashboard] %s Installing Python Virtual Environment\n" "$install"
+    if [ "$pythonExecutable" = "python3" ]; then
+        case "$OS" in
+            ubuntu|debian|raspbian)
+                { sudo apt update ; sudo apt-get install -y python3-venv; printf "\n\n"; } &>> ./log/install.txt
+            ;;
+            centos|fedora|redhat|rhel|almalinux|rocky)
+                if command -v dnf &> /dev/null; then
+                    { sudo dnf install -y python3-virtualenv; printf "\n\n"; } >> ./log/install.txt
+                else
+                    { sudo yum install -y python3-virtualenv; printf "\n\n"; } >> ./log/install.txt
+                fi
+            ;;
+            alpine)
+                { sudo apk update; sudo apk add py3-virtualenv ; printf "\n\n"; } >> ./log/install.txt
+            ;;
+            arch)
+                { echo "Python Virtual Environment is installed by default from version Python3.3"; printf "\n\n"; } &>> ./log/install.txt # https://wiki.archlinux.org/title/Python/Virtual_environment
+            ;;
+            *)
+                _unsupportedOS
+            ;;
+        esac
+    else
+        case "$OS" in
+            ubuntu|debian|raspbian)
+                { sudo apt-get update; sudo apt-get install ${pythonExecutable}-venv; } &>> ./log/install.txt
+            ;;
+        esac
+    fi
+
+    if ! $pythonExecutable -m venv -h > /dev/null 2>&1
+    then
+        printf "[WGDashboard] %s Python Virtual Environment is still not installed, halting script now.\n" "$heavy_crossmark"
+        printf "%s\n" "$helpMsg"
+    else
+        printf "[WGDashboard] %s Python Virtual Environment is installed\n" "$heavy_checkmark"
+    fi
 }
 
 _installPythonPip(){
-	{ printf "\n\n [Installing Python Pip] [%s] \n\n""$(date)"; } >> ./log/install.txt 
-	
-	if ! $pythonExecutable -m pip -h > /dev/null 2>&1
-	then
-		printf "[WGDashboard] %s Installing Python Package Manager (PIP)\n" "$install"
-		case "$OS" in
-			ubuntu|debian|raspbian)
-				if [ "$pythonExecutable" = "python3" ]; then
-					{ sudo apt update ; sudo apt-get install -y python3-pip; printf "\n\n"; } &>> ./log/install.txt
-				else
-					{ sudo apt update ; sudo apt-get install -y ${pythonExecutable}-distutil python3-pip; printf "\n\n"; } &>> ./log/install.txt
-				fi
-			;;
-			centos|fedora|redhat|rhel|almalinux|rocky)
-				if [ "$pythonExecutable" = "python3" ]; then
-					{ sudo dnf install -y python3-pip; printf "\n\n"; } >> ./log/install.txt
-				else
-					{ sudo dnf install -y ${pythonExecutable}-pip; printf "\n\n"; } >> ./log/install.txt
-				fi
-			;;
-			alpine)
-				{ sudo apk update; sudo apk add py3-pip --no-cache; printf "\n\n"; } >> ./log/install.txt
-			;;
-			arch)
-				{ sudo pacman -Syu python-pip; printf "\n\n"; } &>> ./log/install.txt
-			;;
-			*)
-				printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark"
-				printf "%s\n" "$helpMsg"
-				kill  $TOP_PID
-			;;
-		esac
+    _logSection "Installing Python Pip"
+
+    if ! $pythonExecutable -m pip -h > /dev/null 2>&1
+    then
+        printf "[WGDashboard] %s Installing Python Package Manager (PIP)\n" "$install"
+        case "$OS" in
+            ubuntu|debian|raspbian)
+                if [ "$pythonExecutable" = "python3" ]; then
+                    { sudo apt update ; sudo apt-get install -y python3-pip; printf "\n\n"; } &>> ./log/install.txt
+                else
+                    { sudo apt update ; sudo apt-get install -y ${pythonExecutable}-distutil python3-pip; printf "\n\n"; } &>> ./log/install.txt
+                fi
+            ;;
+            centos|fedora|redhat|rhel|almalinux|rocky)
+                if [ "$pythonExecutable" = "python3" ]; then
+                    { sudo dnf install -y python3-pip; printf "\n\n"; } >> ./log/install.txt
+                else
+                    { sudo dnf install -y ${pythonExecutable}-pip; printf "\n\n"; } >> ./log/install.txt
+                fi
+            ;;
+            alpine)
+                { sudo apk update; sudo apk add py3-pip --no-cache; printf "\n\n"; } >> ./log/install.txt
+            ;;
+            arch)
+                { sudo pacman -Syu python-pip; printf "\n\n"; } &>> ./log/install.txt
+            ;;
+            *)
+                _unsupportedOS
+            ;;
+        esac
+    fi
+
+    if ! $pythonExecutable -m pip -h > /dev/null 2>&1
+    then
+        printf "[WGDashboard] %s Python Package Manager (PIP) is still not installed, halting script now.\n" "$heavy_crossmark"
+        printf "%s\n" "$helpMsg"
+        kill $TOP_PID
+    else
+        printf "[WGDashboard] %s Python Package Manager (PIP) is installed\n" "$heavy_checkmark"
     fi
-    	
-	if ! $pythonExecutable -m pip -h > /dev/null 2>&1
-	then
-		printf "[WGDashboard] %s Python Package Manager (PIP) is still not installed, halting script now.\n" "$heavy_crossmark"
-		printf "%s\n" "$helpMsg"
-		kill  $TOP_PID
-	else
-		printf "[WGDashboard] %s Python Package Manager (PIP) is installed\n" "$heavy_checkmark"
-	fi
 }
 
+_checkPythonVersion(){
+    version_pass=$($pythonExecutable -c 'import sys; print("1") if (sys.version_info.major == 3 and sys.version_info.minor >= 12) else print("0");')
+    version=$($pythonExecutable --version)
+    if [ $version_pass == "1" ]
+    then
+        printf "[WGDashboard] %s Found compatible version of Python. Will be using %s to install WGDashboard.\n" "$heavy_checkmark" "$($pythonExecutable --version)"
+        return;
+    elif python3.12 --version > /dev/null 2>&1
+    then
+        printf "[WGDashboard] %s Found Python 3.12. Will be using [python3.12] to install WGDashboard.\n" "$heavy_checkmark"
+        pythonExecutable="python3.12"
+    else
+        printf "[WGDashboard] %s Could not find a compatible version of Python. Current Python is %s.\n" "$heavy_crossmark" "$version"
+        printf "[WGDashboard] WGDashboard required Python 3.12 or above. Halting install now.\n"
+        kill $TOP_PID
+    fi
+}
+
+_determinePypiMirror(){
+    printf "[WGDashboard] %s Pinging list of recommended Python Package Index mirror\n" "$install"
+    urls=(
+        "https://pypi.org/simple/"
+        "https://pypi.tuna.tsinghua.edu.cn/simple/"
+        "https://pypi.mirrors.ustc.edu.cn/simple/"
+        "https://mirrors.aliyun.com/pypi/simple/"
+        "https://pypi.douban.com/simple/"
+    )
+
+    # Ping each mirror's hostname once and extract the RTT
+    index=1
+    printf "              ---------------------------------------------------------\n"
+    for url in "${urls[@]}"; do
+        hostname=$(echo "$url" | awk -F/ '{print $3}')
+        rtt=$(ping -c 1 -W 1 "$hostname" 2>/dev/null | grep 'time=' | awk -F'time=' '{print $2}' | awk '{print $1}')
+        # Handle cases where the hostname is not reachable
+        if [ -z "$rtt" ]; then
+            rtt="9999"
+            printf "              [%i] [FAILED] %s\n" "$index" "$url"
+        else
+            rtt=${rtt//.*/}
+            printf "              [%i] %sms %s\n" "$index" "$rtt" "$url"
+        fi
+        rtthost[$index]=$rtt
+        index=$((index+1))
+    done
+    printf "              ---------------------------------------------------------\n"
+    for i in "${!rtthost[@]}"; do
+        [[ -z ${rtthost[i]} ]] && continue  # Skip unset or empty values
+        if [[ -z $min_val || ${rtthost[i]} -lt $min_val ]]; then
+            min_val=${rtthost[i]}
+            min_idx=$i
+        fi
+    done
+    min_idx=$((min_idx - 1))
+
+    printf "              Which mirror you would like to use (Hit enter to use default)\n"
+    printf "              Default is %s :" "${urls[$min_idx]}"
+    read -t ${msleep} -r choice
+    printf "\n"
+
+    if [[ -z "$choice" ]]; then
+        choice=$((min_idx + 1))
+    fi
+
+    if [[ "$choice" =~ ^[0-9]+$ ]] && (( choice >= 1 && choice <= ${#urls[@]} )); then
+        selected_url="${urls[choice-1]}"
+        printf "[WGDashboard] %s Will download Python packages from %s\n" "$heavy_checkmark" "$selected_url"
+    else
+        selected_url="${urls[0]}"
+        printf "[WGDashboard] %s Will download Python packages from %s\n" "$heavy_checkmark" "${urls[0]}"
+    fi
+}
+
+#------------------------------------------------------------------------------
+# WireGuard
+#------------------------------------------------------------------------------
 _checkWireguard(){
     if ! command -v wg > /dev/null 2>&1 || ! command -v wg-quick > /dev/null 2>&1
     then
-    	printf "[WGDashboard] %s Installing WireGuard\n" "$install"
+        printf "[WGDashboard] %s Installing WireGuard\n" "$install"
         case "$OS" in
             ubuntu|debian|raspbian)
-                { 
-                    sudo apt update && sudo apt-get install -y wireguard; 
-                    printf "\n[WGDashboard] WireGuard installed on %s.\n\n" "$OS"; 
+                {
+                    sudo apt update && sudo apt-get install -y wireguard;
+                    printf "\n[WGDashboard] WireGuard installed on %s.\n\n" "$OS";
                 } &>> ./log/install.txt
                 printf "[WGDashboard] %s WireGuard is successfully installed.\n" "$heavy_checkmark"
             ;;
             centos|fedora|redhat|rhel|almalinux|rocky)
-                { 
+                {
                     sudo dnf install -y wireguard-tools;
-                    printf "\n[WGDashboard] WireGuard installed on %s.\n\n" "$OS"; 
+                    printf "\n[WGDashboard] WireGuard installed on %s.\n\n" "$OS";
                 } &>> ./log/install.txt
                 printf "[WGDashboard] %s WireGuard is successfully installed.\n" "$heavy_checkmark"
             ;;
             alpine)
-                { 
+                {
                     sudo apk update && sudo apk add wireguard-tools --no-cache;
-                    printf "\n[WGDashboard] WireGuard installed on %s.\n\n" "$OS"; 
+                    printf "\n[WGDashboard] WireGuard installed on %s.\n\n" "$OS";
+                } &>> ./log/install.txt
+                printf "[WGDashboard] %s WireGuard is successfully installed.\n" "$heavy_checkmark"
+            ;;
+            arch)
+                {
+                    sudo pacman -Syu wireguard-tools; printf "\n\n";
                 } &>> ./log/install.txt
                 printf "[WGDashboard] %s WireGuard is successfully installed.\n" "$heavy_checkmark"
             ;;
-			arch)
-				{ 
-					sudo pacman -Syu wireguard-tools; printf "\n\n"; 
-				} &>> ./log/install.txt
-				printf "[WGDashboard] %s WireGuard is successfully installed.\n" "$heavy_checkmark"
-			;;
             *)
                 printf "[WGDashboard] %s Sorry, your OS is not supported. Currently, the install script only supports Debian-based, Red Hat-based, and Alpine Linux.\n" "$heavy_crossmark"
                 printf "%s\n" "$helpMsg"
@@ -243,312 +338,323 @@ _checkWireguard(){
     fi
 }
 
-
-
-
-_checkPythonVersion(){
-	version_pass=$($pythonExecutable -c 'import sys; print("1") if (sys.version_info.major == 3 and sys.version_info.minor >= 12) else print("0");')
-	version=$($pythonExecutable --version)
-	if [ $version_pass == "1" ]
-	  	then 
-	  		printf "[WGDashboard] %s Found compatible version of Python. Will be using %s to install WGDashboard.\n" "$heavy_checkmark" "$($pythonExecutable --version)"
-			return;
-    elif python3.12 --version > /dev/null 2>&1
-    	 then
-    	 	printf "[WGDashboard] %s Found Python 3.12. Will be using [python3.12] to install WGDashboard.\n" "$heavy_checkmark"
-    	 	pythonExecutable="python3.12"
-	else
-		printf "[WGDashboard] %s Could not find a compatible version of Python. Current Python is %s.\n" "$heavy_crossmark" "$version"
-		printf "[WGDashboard] WGDashboard required Python 3.12 or above. Halting install now.\n"
-		kill $TOP_PID
-	fi
+#------------------------------------------------------------------------------
+# Frontend (Node.js) - Docker builds the frontend itself, so this is only for
+# bare-metal installs.
+#------------------------------------------------------------------------------
+_installNode(){
+    _logSection "Installing Node.js"
+    printf "[WGDashboard] %s Installing Node.js and npm\n" "$install"
+    case "$OS" in
+        ubuntu|debian|raspbian)
+            { sudo apt update ; sudo apt-get install -y nodejs npm; printf "\n\n"; } &>> ./log/install.txt
+        ;;
+        centos|fedora|redhat|rhel|almalinux|rocky)
+            if command -v dnf &> /dev/null; then
+                { sudo dnf install -y nodejs npm; printf "\n\n"; } &>> ./log/install.txt
+            else
+                { sudo yum install -y nodejs npm; printf "\n\n"; } &>> ./log/install.txt
+            fi
+        ;;
+        alpine)
+            { sudo apk update; sudo apk add nodejs npm --no-cache; printf "\n\n"; } &>> ./log/install.txt
+        ;;
+        arch)
+            { sudo pacman -Syu nodejs npm; printf "\n\n"; } &>> ./log/install.txt
+        ;;
+        *)
+            _unsupportedOS
+        ;;
+    esac
 }
 
-_determinePypiMirror(){
-	printf "[WGDashboard] %s Pinging list of recommended Python Package Index mirror\n" "$install"
-	urls=(
-		"https://pypi.org/simple/"
-		"https://pypi.tuna.tsinghua.edu.cn/simple/"
-		"https://pypi.mirrors.ustc.edu.cn/simple/"
-		"https://mirrors.aliyun.com/pypi/simple/"
-		"https://pypi.douban.com/simple/"
-	)
+# Vite requires Node.js ^20.19.0 || >=22.12.0
+_isNodeVersionSupported(){
+    local node_version major minor
+    node_version=$(node --version 2>/dev/null | sed 's/^v//')
+    major=${node_version%%.*}
+    minor=${node_version#*.}
+    minor=${minor%%.*}
+    [[ "$major" =~ ^[0-9]+$ && "$minor" =~ ^[0-9]+$ ]] || return 1
 
-	# Function to extract hostname and ping it
-	index=1
-	printf "              ---------------------------------------------------------\n"
-	for url in "${urls[@]}"; do
-		# Extract the hostname from the URL
-		hostname=$(echo "$url" | awk -F/ '{print $3}')
-		# Ping the hostname once and extract the RTT
-		rtt=$(ping -c 1 -W 1 "$hostname" 2>/dev/null | grep 'time=' | awk -F'time=' '{print $2}' | awk '{print $1}')
-		# Handle cases where the hostname is not reachable
-		if [ -z "$rtt" ]; then
-			rtt="9999"
-			printf "              [%i] [FAILED] %s\n" "$index" "$url"
-		else
-			rtt=${rtt//.*/}
-			printf "              [%i] %sms %s\n" "$index" "$rtt" "$url"
-		fi
-		rtthost[$index]=$rtt
-		index=$((index+1))
-	done
-	printf "              ---------------------------------------------------------\n"
-	for i in "${!rtthost[@]}"; do
-		[[ -z ${rtthost[i]} ]] && continue  # Skip unset or empty values
-		if [[ -z $min_val || ${rtthost[i]} -lt $min_val ]]; then
-			min_val=${rtthost[i]}
-			min_idx=$i
-		fi
-	done
-	min_idx=$((min_idx - 1))
-	
-	printf "              Which mirror you would like to use (Hit enter to use default)\n"
-	printf "              Default is %s :" "${urls[$min_idx]}"
-	read -t ${msleep} -r choice
-	printf "\n"
+    if (( major > 22 )); then return 0; fi
+    if (( major == 22 && minor >= 12 )); then return 0; fi
+    if (( major == 20 && minor >= 19 )); then return 0; fi
+    return 1
+}
 
-	if [[ -z "$choice" ]]; then
-		choice=$((min_idx + 1))
-	fi
+_checkNode(){
+    if ! command -v node > /dev/null 2>&1 || ! command -v npm > /dev/null 2>&1
+    then
+        _installNode
+    fi
 
-	if [[ "$choice" =~ ^[0-9]+$ ]] && (( choice >= 1 && choice <= ${#urls[@]} )); then
-		selected_url="${urls[choice-1]}"
-		printf "[WGDashboard] %s Will download Python packages from %s\n" "$heavy_checkmark" "$selected_url"
-	else
-		selected_url="${urls[0]}"
-		printf "[WGDashboard] %s Will download Python packages from %s\n" "$heavy_checkmark" "${urls[0]}"
-	fi
+    if ! command -v node > /dev/null 2>&1 || ! command -v npm > /dev/null 2>&1
+    then
+        printf "[WGDashboard] %s Node.js and npm are still not installed, halting script now.\n" "$heavy_crossmark"
+        printf "%s\n" "$helpMsg"
+        kill $TOP_PID
+    elif ! _isNodeVersionSupported
+    then
+        printf "[WGDashboard] %s Found Node.js %s, but the frontend requires Node.js 20.19+ or 22.12+. Halting install now.\n" "$heavy_crossmark" "$(node --version)"
+        printf "%s\n" "$helpMsg"
+        kill $TOP_PID
+    else
+        printf "[WGDashboard] %s Node.js %s and npm %s are installed\n" "$heavy_checkmark" "$(node --version)" "$(npm --version)"
+    fi
+}
+
+_compileFrontend(){
+    _logSection "Compiling Frontend"
+    _checkNode
+
+    local dir
+    for dir in "${frontend_dirs[@]}"; do
+        printf "[WGDashboard] %s Compiling frontend in %s\n" "$install" "$dir"
+        if ! ( cd "$dir" && npm ci && npm run build ) &>> ./log/install.txt
+        then
+            printf "[WGDashboard] %s Failed to compile frontend in %s, halting script now.\n" "$heavy_crossmark" "$dir"
+            printf "%s\n" "$helpMsg"
+            kill $TOP_PID
+            return 1
+        fi
+    done
+    printf "[WGDashboard] %s Frontend is compiled\n" "$heavy_checkmark"
+}
+
+#------------------------------------------------------------------------------
+# Install
+#------------------------------------------------------------------------------
+_ensureFolder(){
+    if [ ! -d "$1" ]
+    then
+        mkdir "$1"
+        printf "[WGDashboard] %s Created ./%s folder\n" "$heavy_checkmark" "$1"
+    else
+        printf "[WGDashboard] %s Found existing ./%s folder\n" "$heavy_checkmark" "$1"
+    fi
 }
 
 install_wgd(){
     printf "[WGDashboard] Starting to install WGDashboard\n"
     _determineOS
-    
-	if [ ! -d "log" ] 
-	then 
-			mkdir "log"
-			printf "[WGDashboard] %s Created ./log folder\n" "$heavy_checkmark"
-	else
-		printf "[WGDashboard] %s Found existing ./log folder\n" "$heavy_checkmark"
-	fi
-	
-	if [ ! -d "download" ]
-	then 
-		mkdir "download"
-		printf "[WGDashboard] %s Created ./download folder\n" "$heavy_checkmark"
-	else
-		printf "[WGDashboard] %s Found existing ./download folder\n" "$heavy_checkmark"
-	fi
-    
-    if [ ! -d "db" ] 
-	then 
-		mkdir "db"
-		printf "[WGDashboard] %s Created ./db folder\n" "$heavy_checkmark"
-	else
-		printf "[WGDashboard] %s Found existing ./db folder\n" "$heavy_checkmark"
-	fi
-    
+
+    _ensureFolder "log"
+    _ensureFolder "download"
+    _ensureFolder "db"
+
     if ! python3 --version > /dev/null 2>&1
     then
-    	printf "[WGDashboard] Python is not installed, trying to install now\n"
-    	_installPython
+        printf "[WGDashboard] Python is not installed, trying to install now\n"
+        _installPython
     else
-    	printf "[WGDashboard] %s Python is installed\n" "$heavy_checkmark"
+        printf "[WGDashboard] %s Python is installed\n" "$heavy_checkmark"
     fi
-    
+
     _determinePypiMirror
     _checkPythonVersion
     _installPythonVenv
     _installPythonPip
-	_checkWireguard
+    _checkWireguard
+    _compileFrontend
     sudo chmod -R 755 /etc/wireguard/
-    
+
     _check_and_set_venv
     printf "[WGDashboard] %s Upgrading Python Package Manage (PIP)\n" "$install"
-	{ date; python3 -m ensurepip --upgrade; printf "\n\n"; } >> ./log/install.txt
+    { date; python3 -m ensurepip --upgrade; printf "\n\n"; } >> ./log/install.txt
     { date; python3 -m pip install --upgrade pip -i "$selected_url"; printf "\n\n"; } >> ./log/install.txt
     printf "[WGDashboard] %s Installing latest Python dependencies\n" "$install"
-	{ date; python3 -m pip install -r requirements.txt  -i "$selected_url"; printf "\n\n"; } >> ./log/install.txt #This all works on the default installation.
-    
-      
-	if [ ! -f "ssl-tls.ini" ]
-		then
-			printf "[SSL/TLS]\ncertificate_path = \nprivate_key_path = \n" >> ssl-tls.ini
-			printf "[WGDashboard] %s Created ssl-tls.ini\n" "$heavy_checkmark"
-	else
-			printf "[WGDashboard] %s Found existing ssl-tls.ini\n" "$heavy_checkmark"
-	fi
+    { date; python3 -m pip install -r requirements.txt  -i "$selected_url"; printf "\n\n"; } >> ./log/install.txt #This all works on the default installation.
+
+    if [ ! -f "ssl-tls.ini" ]
+    then
+        printf "[SSL/TLS]\ncertificate_path = \nprivate_key_path = \n" >> ssl-tls.ini
+        printf "[WGDashboard] %s Created ssl-tls.ini\n" "$heavy_checkmark"
+    else
+        printf "[WGDashboard] %s Found existing ssl-tls.ini\n" "$heavy_checkmark"
+    fi
+
     printf "[WGDashboard] %s WGDashboard installed successfully!\n" "$heavy_checkmark"
     printf "[WGDashboard] Enter ./wgd.sh start to start the dashboard\n"
 }
 
+#------------------------------------------------------------------------------
+# Status / SSL
+#------------------------------------------------------------------------------
 check_wgd_status(){
-  if test -f "$PID_FILE"; then
-    if ps aux | grep -v grep | grep $(cat ./gunicorn.pid)  > /dev/null; then
-    return 0
+    if test -f "$PID_FILE"; then
+        if ps aux | grep -v grep | grep $(cat ./gunicorn.pid) > /dev/null; then
+            return 0
+        else
+            return 1
+        fi
     else
-      return 1
+        if ps aux | grep -v grep | grep '[p]ython3 '$app_name > /dev/null; then
+            return 0
+        else
+            return 1
+        fi
     fi
-  else
-    if ps aux | grep -v grep | grep '[p]ython3 '$app_name > /dev/null; then
-      return 0
-    else
-      return 1
-    fi
-  fi
 }
 
 certbot_create_ssl () {
-	certbot certonly --config ./certbot.ini --email "$EMAIL" --work-dir $cb_work_dir --config-dir $cb_config_dir --domain "$SERVERURL"
+    certbot certonly --config ./certbot.ini --email "$EMAIL" --work-dir $cb_work_dir --config-dir $cb_config_dir --domain "$SERVERURL"
 }
 
 certbot_renew_ssl () {
-	certbot renew --work-dir $cb_work_dir --config-dir $cb_config_dir
+    certbot renew --work-dir $cb_work_dir --config-dir $cb_config_dir
 }
 
+#------------------------------------------------------------------------------
+# Start / Stop
+#------------------------------------------------------------------------------
 gunicorn_start () {
-  printf "[WGDashboard] Starting WGDashboard with Gunicorn in the background.\n"
-  d=$(date '+%Y%m%d%H%M%S')
-  if [[ $USER == root ]]; then
-    export PATH=$PATH:/usr/local/bin:$HOME/.local/bin
-  fi
-  _check_and_set_venv
-  sudo "$venv_gunicorn" --config ./gunicorn.conf.py
-  sleep 5
-  checkPIDExist=0
-  while [ $checkPIDExist -eq 0 ]
-  do
-  		if test -f './gunicorn.pid'; then
-  			checkPIDExist=1
-  			printf "[WGDashboard] Checking if WGDashboard w/ Gunicorn started successfully\n"
-  		fi
-  		sleep 2
-  done
-  printf "[WGDashboard] WGDashboard w/ Gunicorn started successfully\n"
+    printf "[WGDashboard] Starting WGDashboard with Gunicorn in the background.\n"
+    d=$(date '+%Y%m%d%H%M%S')
+    if [[ $USER == root ]]; then
+        export PATH=$PATH:/usr/local/bin:$HOME/.local/bin
+    fi
+    _check_and_set_venv
+    sudo "$venv_gunicorn" --config ./gunicorn.conf.py
+    sleep 5
+    checkPIDExist=0
+    while [ $checkPIDExist -eq 0 ]
+    do
+        if test -f './gunicorn.pid'; then
+            checkPIDExist=1
+            printf "[WGDashboard] Checking if WGDashboard w/ Gunicorn started successfully\n"
+        fi
+        sleep 2
+    done
+    printf "[WGDashboard] WGDashboard w/ Gunicorn started successfully\n"
 }
 
 gunicorn_stop () {
-	checkPIDExist=1
-	while [ $checkPIDExist -eq 1 ]
-	do
-		if test -f "$PID_FILE"; then
-			printf "[WGDashboard] Stopping WGDashboard w/ Gunicorn on PID %s\n" "$(cat ./gunicorn.pid)"
-			sudo kill "$(cat ./gunicorn.pid)"
-		else
-			checkPIDExist=0
-		fi
-		sleep 2
-	done
-	printf "[WGDashboard] WGDashboard is stopped.\n"
+    checkPIDExist=1
+    while [ $checkPIDExist -eq 1 ]
+    do
+        if test -f "$PID_FILE"; then
+            printf "[WGDashboard] Stopping WGDashboard w/ Gunicorn on PID %s\n" "$(cat ./gunicorn.pid)"
+            sudo kill "$(cat ./gunicorn.pid)"
+        else
+            checkPIDExist=0
+        fi
+        sleep 2
+    done
+    printf "[WGDashboard] WGDashboard is stopped.\n"
 }
 
 start_wgd () {
-	_checkWireguard
+    _checkWireguard
     gunicorn_start
 }
 
 stop_wgd() {
-	if test -f "$PID_FILE"; then
-		gunicorn_stop
-	else
-		kill "$(ps aux | grep "[p]ython3 $app_name" | awk '{print $2}')"
-	fi
+    if test -f "$PID_FILE"; then
+        gunicorn_stop
+    else
+        kill "$(ps aux | grep "[p]ython3 $app_name" | awk '{print $2}')"
+    fi
 }
 
 start_wgd_debug() {
-	_checkWireguard
-	printf "[WGDashboard] Starting WGDashboard in the foreground.\n"
-	sudo "$venv_python" "$app_name"
+    _checkWireguard
+    printf "[WGDashboard] Starting WGDashboard in the foreground.\n"
+    sudo "$venv_python" "$app_name"
 }
 
+#------------------------------------------------------------------------------
+# Update
+#------------------------------------------------------------------------------
 update_wgd() {
-	_determineOS
-	if ! python3 --version > /dev/null 2>&1
-	then
-		printf "[WGDashboard] Python is not installed, trying to install now\n"
-		_installPython
-	else
-		printf "[WGDashboard] %s Python is installed\n" "$heavy_checkmark"
-	fi
-	
-	_checkPythonVersion
-	_installPythonVenv
-	_installPythonPip	
-	
-	new_ver=$($venv_python -c "import json; import urllib.request; data = urllib.request.urlopen('https://api.github.com/repos/WGDashboard/WGDashboard/releases/latest').read(); output = json.loads(data);print(output['tag_name'])")
+    _determineOS
+    if ! python3 --version > /dev/null 2>&1
+    then
+        printf "[WGDashboard] Python is not installed, trying to install now\n"
+        _installPython
+    else
+        printf "[WGDashboard] %s Python is installed\n" "$heavy_checkmark"
+    fi
 
-	if [ "$commandConfirmed" = "true" ]; then
-		printf "[WGDashboard] Confirmation granted.\n"
-		up="Y"
-	else
-		printf "[WGDashboard] Are you sure you want to update to the %s? (Y/N): " "$new_ver"
-		read up
-	fi
+    _checkPythonVersion
+    _installPythonVenv
+    _installPythonPip
 
-	if [ "$up" = "Y" ] || [ "$up" = "y" ]; then
-		printf "[WGDashboard] Shutting down WGDashboard\n"
+    new_ver=$($venv_python -c "import json; import urllib.request; data = urllib.request.urlopen('https://api.github.com/repos/WGDashboard/WGDashboard/releases/latest').read(); output = json.loads(data);print(output['tag_name'])")
 
-		if check_wgd_status; then
-			stop_wgd
-		fi
+    if [ "$commandConfirmed" = "true" ]; then
+        printf "[WGDashboard] Confirmation granted.\n"
+        up="Y"
+    else
+        printf "[WGDashboard] Are you sure you want to update to the %s? (Y/N): " "$new_ver"
+        read up
+    fi
 
-		mv wgd.sh wgd.sh.old
-		printf "[WGDashboard] Downloading %s from GitHub..." "$new_ver"
-		{ date; git stash; git pull https://github.com/WGDashboard/WGDashboard.git $new_ver --force; } >> ./log/update.txt
-		chmod +x ./wgd.sh
-		sudo ./wgd.sh install
-		printf "[WGDashboard] Update completed!\n"
-		rm wgd.sh.old
-	else
-		printf "[WGDashboard] Update Canceled.\n"
-	fi
+    if [ "$up" = "Y" ] || [ "$up" = "y" ]; then
+        printf "[WGDashboard] Shutting down WGDashboard\n"
+
+        if check_wgd_status; then
+            stop_wgd
+        fi
+
+        mv wgd.sh wgd.sh.old
+        printf "[WGDashboard] Downloading %s from GitHub..." "$new_ver"
+        { date; git stash; git pull https://github.com/WGDashboard/WGDashboard.git $new_ver --force; } >> ./log/update.txt
+        chmod +x ./wgd.sh
+        sudo ./wgd.sh install
+        printf "[WGDashboard] Update completed!\n"
+        rm wgd.sh.old
+    else
+        printf "[WGDashboard] Update Canceled.\n"
+    fi
 }
 
-
+#------------------------------------------------------------------------------
+# Entry point
+#------------------------------------------------------------------------------
 print_header
 if [ "$#" -lt 1 ]; then
-	help
+    help
 else
-	if [ "$2" = "-y" ] || [ "$2" = "-Y" ]; then
-		commandConfirmed="true"
-	fi
+    if [ "$2" = "-y" ] || [ "$2" = "-Y" ]; then
+        commandConfirmed="true"
+    fi
 
-	if [ "$1" = "start" ]; then
-		if check_wgd_status; then
-			printf "[WGDashboard] WGDashboard is already running.\n"
-		else
-			start_wgd
-		fi
-	elif [ "$1" = "stop" ]; then
-		if check_wgd_status; then
-			stop_wgd			
-		else
-			printf "[WGDashboard] WGDashboard is not running.\n"
-		fi
-	elif [ "$1" = "update" ]; then
-		update_wgd
-	elif [ "$1" = "install" ]; then
-		install_wgd
-	elif [ "$1" = "restart" ]; then
-		if check_wgd_status; then
-			stop_wgd
-			start_wgd
-		else
-			start_wgd
-		fi
-	elif [ "$1" = "debug" ]; then
-		if check_wgd_status; then
-			printf "[WGDashboard] WGDashboard is already running.\n"
-		else
-			start_wgd_debug
-		fi
-	elif [ "$1" = "os" ]; then
-    		_determineOS
+    if [ "$1" = "start" ]; then
+        if check_wgd_status; then
+            printf "[WGDashboard] WGDashboard is already running.\n"
+        else
+            start_wgd
+        fi
+    elif [ "$1" = "stop" ]; then
+        if check_wgd_status; then
+            stop_wgd
+        else
+            printf "[WGDashboard] WGDashboard is not running.\n"
+        fi
+    elif [ "$1" = "update" ]; then
+        update_wgd
+    elif [ "$1" = "install" ]; then
+        install_wgd
+    elif [ "$1" = "restart" ]; then
+        if check_wgd_status; then
+            stop_wgd
+            start_wgd
+        else
+            start_wgd
+        fi
+    elif [ "$1" = "debug" ]; then
+        if check_wgd_status; then
+            printf "[WGDashboard] WGDashboard is already running.\n"
+        else
+            start_wgd_debug
+        fi
+    elif [ "$1" = "os" ]; then
+        _determineOS
     elif [ "$1" = "ping" ]; then
-        	_determinePypiMirror
-	else
-		help
-	fi
+        _determinePypiMirror
+    else
+        help
+    fi
 fi
 printf "%s\n" "$dashes"