Reorder contact addresses in site header

         $if "note" in owner:
             <span class=p-note>$owner["note"][0]</span><br>
         <small class=identifiers>
+        <a class="u-url u-uid" rel=me href=/><code>@$tx.host.name</code></a>
+        $if nickname := get_first(owner, "nickname"):
+            &bull; <a href=/owner/actor><code>@$nickname@$tx.host.name</code></a>
         $if email := get_first(owner, "email"):
-            <a class=u-email
-                href=mailto:$owner["email"][0]><code>$owner["email"][0]</code></a> &bull;
+            &bull; <a class=u-email
+                href=mailto:$owner["email"][0]><code>$owner["email"][0]</code></a>
         $if onion := get_onion():
             $ _stripped_onion = onion.lstrip("x")
             $ _prefix_length = len(onion) - len(_stripped_onion)
-            <a class=u-url rel=me
-                href=http://$onion><code>@$_stripped_onion[:12-_prefix_length]</code></a> &bull;
-        <code><a class="u-url u-uid" rel=me href=/>@$tx.host.name</code>
-        $if nickname := get_first(owner, "nickname"):
-            &bull; <a href=/owner/actor><code>@$nickname@$tx.host.name</code></a>
+            &bull; <a class=u-url rel=me
+                href=http://$onion><code>@$_stripped_onion[:12-_prefix_length]</code></a>
         $if key := get_key():
             &bull; <a class=p-key href=/owner/keyring><code>$:"&ndash;".join(key.split()[:2])</code></a>
         </small>