diff --git a/cmd/diagd/diagd.go b/cmd/diagd/diagd.go
index 779737c..85fcda1 100644
--- a/cmd/diagd/diagd.go
+++ b/cmd/diagd/diagd.go
@@ -26,6 +26,7 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"strings"
 	"sync"
 	"syscall"
 
@@ -49,14 +50,18 @@ func updateListeners() error {
 	return nil
 }
 
-func dump(w io.Writer, re *diag.EvalResult) {
+func dump(indent int, w io.Writer, re *diag.EvalResult) {
 	symbol := "✔"
 	if re.Error {
 		symbol = "✘"
 	}
-	fmt.Fprintf(w, "<li>%s %s: %s<ul>", symbol, html.EscapeString(re.Name), html.EscapeString(re.Status))
+	fmt.Fprintf(w, "<li>\n%s%s %s: %s<ul>",
+		strings.Repeat("  ", indent),
+		symbol,
+		html.EscapeString(re.Name),
+		html.EscapeString(re.Status))
 	for _, ch := range re.Children {
-		dump(w, ch)
+		dump(indent+1, w, ch)
 	}
 	fmt.Fprintf(w, "</ul></li>")
 }
@@ -96,7 +101,7 @@ func logic() error {
 		re := m.Evaluate()
 		mu.Unlock()
 		fmt.Fprintf(w, `<!DOCTYPE html><style type="text/css">ul { list-style-type: none; }</style><ul>`)
-		dump(w, re)
+		dump(0, w, re)
 	})
 	http.HandleFunc("/health.json", func(w http.ResponseWriter, r *http.Request) {
 		mu.Lock()
diff --git a/internal/diag/ping.go b/internal/diag/ping.go
index a39bd47..43ecb2f 100644
--- a/internal/diag/ping.go
+++ b/internal/diag/ping.go
@@ -34,7 +34,7 @@ type ping4gw struct {
 }
 
 func (d *ping4gw) String() string {
-	return "ping4/<default-gateway>"
+	return "ping4: $default-gateway"
 }
 
 func (d *ping4gw) Then(t Node) Node {
@@ -93,7 +93,7 @@ type ping4 struct {
 }
 
 func (d *ping4) String() string {
-	return "ping4/" + d.addr
+	return "ping4: " + d.addr
 }
 
 func (d *ping4) Then(t Node) Node {
@@ -134,7 +134,7 @@ type ping6gw struct {
 }
 
 func (d *ping6gw) String() string {
-	return "ping6gw/<default-gateway>"
+	return "ping6gw: $default-gateway"
 }
 
 func (d *ping6gw) Then(t Node) Node {
@@ -198,9 +198,9 @@ type ping6 struct {
 
 func (d *ping6) String() string {
 	if d.ifname == "" {
-		return "ping6/" + d.addr
+		return "ping6: " + d.addr
 	}
-	return fmt.Sprintf("ping6/%s→%s", d.ifname, d.addr)
+	return fmt.Sprintf("ping6: %s → %s", d.ifname, d.addr)
 }
 
 func (d *ping6) Then(t Node) Node {
diff --git a/internal/diag/tcp.go b/internal/diag/tcp.go
index bc2be15..bad741e 100644
--- a/internal/diag/tcp.go
+++ b/internal/diag/tcp.go
@@ -24,7 +24,7 @@ type tcp4 struct {
 }
 
 func (d *tcp4) String() string {
-	return "tcp4/" + d.addr
+	return "tcp4: " + d.addr
 }
 
 func (d *tcp4) Then(t Node) Node {
@@ -57,7 +57,7 @@ type tcp6 struct {
 }
 
 func (d *tcp6) String() string {
-	return "tcp6/" + d.addr
+	return "tcp6: " + d.addr
 }
 
 func (d *tcp6) Then(t Node) Node {
