diff --git a/iso/overlay/usr/local/bin/bee-boot-status b/iso/overlay/usr/local/bin/bee-boot-status
index 083793d..2ea5e26 100644
--- a/iso/overlay/usr/local/bin/bee-boot-status
+++ b/iso/overlay/usr/local/bin/bee-boot-status
@@ -6,21 +6,54 @@
 
 # Services to wait for before handing off to login prompt.
 CRITICAL="bee-preflight bee-nvidia bee-audit"
-# Additional services shown for information only.
-ALL="bee-preflight bee-network bee-nvidia bee-audit bee-web"
+
+# Services shown with details.
+ALL="bee-sshsetup ssh bee-network bee-nvidia bee-preflight bee-audit bee-web"
+
+svc_state() {
+    systemctl is-active "$1.service" 2>/dev/null || echo "inactive"
+}
 
 svc_icon() {
-    case "$(systemctl is-active "$1.service" 2>/dev/null)" in
+    case "$(svc_state "$1")" in
         active)     printf '\033[32m[  OK  ]\033[0m' ;;
         failed)     printf '\033[31m[ FAIL ]\033[0m' ;;
         activating) printf '\033[33m[  ..  ]\033[0m' ;;
-        *)          printf        '[      ]'          ;;
+        deactivating) printf '\033[33m[ stop ]\033[0m' ;;
+        inactive)   printf '\033[90m[      ]\033[0m' ;;
+        *)          printf '\033[90m[  ?   ]\033[0m' ;;
     esac
 }
 
+svc_detail() {
+    local svc="$1"
+    local state
+    state="$(svc_state "$svc")"
+
+    case "$state" in
+        failed)
+            # Show why it failed
+            local msg
+            msg="$(systemctl show -p Result "$svc.service" 2>/dev/null | cut -d= -f2)"
+            [ -n "$msg" ] && [ "$msg" != "success" ] && printf ' \033[31m(%s)\033[0m' "$msg"
+            ;;
+        activating)
+            # Show last journal line
+            local line
+            line="$(journalctl -u "$svc.service" -n 1 --no-pager --output=cat 2>/dev/null | head -c 60)"
+            [ -n "$line" ] && printf ' \033[90m%s\033[0m' "$line"
+            ;;
+    esac
+}
+
+get_ips() {
+    ip -4 addr show scope global 2>/dev/null \
+        | awk '/inet /{printf "  %s\t%s\n", $NF, $2}'
+}
+
 all_critical_done() {
     for svc in $CRITICAL; do
-        case "$(systemctl is-active "$svc.service" 2>/dev/null)" in
+        case "$(svc_state "$svc")" in
             active|failed|inactive) ;;
             *) return 1 ;;
         esac
@@ -29,28 +62,47 @@ all_critical_done() {
 }
 
 while true; do
-    printf '\033[H\033[2J'
-    printf '\n'
-    printf '  \033[33m███████╗ █████╗ ███████╗██╗   ██╗      ██████╗ ███████╗███████╗\033[0m\n'
-    printf '  \033[33m██╔════╝██╔══██╗██╔════╝╚██╗ ██╔╝      ██╔══██╗██╔════╝██╔════╝\033[0m\n'
-    printf '  \033[33m█████╗  ███████║███████╗ ╚████╔╝ █████╗██████╔╝█████╗  █████╗\033[0m\n'
-    printf '  \033[33m██╔══╝  ██╔══██║╚════██║  ╚██╔╝  ╚════╝██╔══██╗██╔══╝  ██╔══╝\033[0m\n'
-    printf '  \033[33m███████╗██║  ██║███████║   ██║         ██████╔╝███████╗███████╗\033[0m\n'
-    printf '  \033[33m╚══════╝╚═╝  ╚═╝╚══════╝   ╚═╝         ╚═════╝ ╚══════╝╚══════╝\033[0m\n'
-    printf '  Hardware Audit LiveCD\n'
-    printf '\n'
-    for svc in $ALL; do
-        printf '  %s  %s\n' "$(svc_icon $svc)" "$svc"
-    done
-    printf '\n'
+    # Build frame in a variable to reduce flicker
+    out=""
+    out="${out}$(printf '\033[H\033[2J')"
+    out="${out}$(printf '\n')"
+    out="${out}$(printf '  \033[33m███████╗ █████╗ ███████╗██╗   ██╗      ██████╗ ███████╗███████╗\033[0m\n')"
+    out="${out}$(printf '  \033[33m██╔════╝██╔══██╗██╔════╝╚██╗ ██╔╝      ██╔══██╗██╔════╝██╔════╝\033[0m\n')"
+    out="${out}$(printf '  \033[33m█████╗  ███████║███████╗ ╚████╔╝ █████╗██████╔╝█████╗  █████╗\033[0m\n')"
+    out="${out}$(printf '  \033[33m██╔══╝  ██╔══██║╚════██║  ╚██╔╝  ╚════╝██╔══██╗██╔══╝  ██╔══╝\033[0m\n')"
+    out="${out}$(printf '  \033[33m███████╗██║  ██║███████║   ██║         ██████╔╝███████╗███████╗\033[0m\n')"
+    out="${out}$(printf '  \033[33m╚══════╝╚═╝  ╚═╝╚══════╝   ╚═╝         ╚═════╝ ╚══════╝╚══════╝\033[0m\n')"
+    out="${out}$(printf '  Hardware Audit LiveCD\n')"
+    out="${out}$(printf '\n')"
 
-    if all_critical_done; then
-        printf '  \033[1mSystem ready.\033[0m  Audit is running in the background.\n'
-        printf '  Web UI will be available at \033[1mhttp://<ip>/\033[0m when done.\n'
-        printf '\n'
-        sleep 2
-        break
+    # Services
+    for svc in $ALL; do
+        out="${out}$(printf '  %s  %-20s%s\n' "$(svc_icon "$svc")" "$svc" "$(svc_detail "$svc")")"
+    done
+    out="${out}$(printf '\n')"
+
+    # Network
+    ips="$(get_ips)"
+    if [ -n "$ips" ]; then
+        out="${out}$(printf '  \033[1mNetwork:\033[0m\n')"
+        out="${out}$(printf '%s\n' "$ips")"
+        out="${out}$(printf '\n')"
     fi
 
-    sleep 1
+    # Status line
+    if all_critical_done; then
+        out="${out}$(printf '  \033[1mSystem ready.\033[0m  Audit is running in the background.\n')"
+        if [ -n "$ips" ]; then
+            first_ip="$(echo "$ips" | awk '{print $2}' | cut -d/ -f1 | head -1)"
+            out="${out}$(printf '  Web UI: \033[1mhttp://%s/\033[0m\n' "$first_ip")"
+        fi
+        printf '%s\n' "$out"
+        sleep 3
+        break
+    else
+        out="${out}$(printf '  \033[90mStarting up...\033[0m\n')"
+    fi
+
+    printf '%s' "$out"
+    sleep 3
 done