diff --git a/templates/avatars.hamlet b/templates/avatars.hamlet
index f114f12..b892f2b 100644
--- a/templates/avatars.hamlet
+++ b/templates/avatars.hamlet
@@ -7,16 +7,12 @@ $if null avatars
   <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}
+
+<article .article #func>
+  <a href=@{NewAvatarR}>
+    <p>_{MsgNewAvatar}
diff --git a/templates/supplier.hamlet b/templates/supplier.hamlet
index e1d4210..33d1496 100644
--- a/templates/supplier.hamlet
+++ b/templates/supplier.hamlet
@@ -1,9 +1,5 @@
 $doctype 5
 
-<article .article #func>
-  <a href=@{NewSupplierR}>
-    <p>_{MsgCreateSupplier}
-
 $forall (Entity sId sup) <- sups
   <article .article>
     $if supplierAvatar sup /= Nothing
@@ -12,3 +8,7 @@ $forall (Entity sId sup) <- sups
     $else
       <a href=@{SupplierActionsR sId}>
         <p>#{supplierIdent sup}
+
+<article .article #func>
+  <a href=@{NewSupplierR}>
+    <p>_{MsgCreateSupplier}