diff --git a/templates/avatars.hamlet b/templates/avatars.hamlet
index 09e7d88..f114f12 100755
--- a/templates/avatars.hamlet
+++ b/templates/avatars.hamlet
@@ -4,14 +4,19 @@ $doctype 5
   Avatars
 
 $if null avatars
-  <p>
-    _{MsgNoAvatars}
+  <h3>
+    <p>
+      _{MsgNoAvatars}
+
+  <article .article #func>
+    <a href=@{NewAvatarR}>
+      <p>_{MsgNewAvatar}
 $else
+  <article .article #func>
+    <a href=@{NewAvatarR}>
+      <p>_{MsgNewAvatar}
+
   $forall (Entity aId avatar) <- avatars
     <article .article>
       <a href=@{ModifyAvatarR aId} style="background-image: url(@{GetAvatarR aId})" .avatar>
         <p>#{avatarIdent avatar}
-
-<ul>
-  <li>
-    <a href=@{NewAvatarR}>_{MsgNewAvatar}