diff --git a/fun.go b/fun.go
index 7cfa67e..5d2c7cf 100644
--- a/fun.go
+++ b/fun.go
@@ -318,7 +318,7 @@ func originate(u string) string {
 func honkerhandle(h string) string {
 	m := re_unurl.FindStringSubmatch(h)
 	if len(m) > 2 {
-		return fmt.Sprintf("%s@%s", m[2], m[1])
+		return m[2]
 	}
 	return h
 }
diff --git a/views/honk.html b/views/honk.html
index c271489..20fdaef 100644
--- a/views/honk.html
+++ b/views/honk.html
@@ -2,22 +2,22 @@
 {{ with .Honk }}
 <header>
 <img alt="avatar" src="/a?a={{ .Honker}}">
-<p><a href="{{ .Honker }}" rel=noreferrer>{{ .Username }}</a> <span class="clip">{{ .What }} {{ .Date.Format "02 Jan 2006 15:04" }} <a href="{{ .URL }}" rel=noreferrer>{{ .URL }}</a></span>
+<p><a href="{{ .Honker }}" rel=noreferrer>{{ .Username }}</a> <span class="clip"><a href="{{ .URL }}" rel=noreferrer>{{ .What }}</a> {{ .Date.Format "02 Jan 2006 15:04" }}</span>
 {{ if .Oonker }}
 <br>
-<span style="margin-left: 3em;" class="clip">
+<span style="margin-left: 1em;" class="clip">
 original: {{ .Oonker }}
 </span>
 {{ else }}
 {{ if .RID }}
 <br>
-<span style="margin-left: 3em;" class="clip">
+<span style="margin-left: 1em;" class="clip">
 in reply to: <a href="{{ .RID }}" rel=noreferrer>{{ .RID }}</a>
 </span>
 {{ end }}
 {{ end }}
 <br>
-<span style="margin-left: 3em;" class="clip">
+<span style="margin-left: 1em;" class="clip">
 convoy: <a href="/t?c={{ .Convoy }}">{{ .Convoy }}</a>
 </span>
 </header>