diff --git a/templates/foreign_wishlist.gotmpl b/templates/foreign_wishlist.gotmpl
index 23d2b95..3271773 100644
--- a/templates/foreign_wishlist.gotmpl
+++ b/templates/foreign_wishlist.gotmpl
@@ -84,14 +84,15 @@
         {{end}}
         <form method="post">
           <div class="input-group mt-3">
-            <input class="form-control" name="gift_name"
-              placeholder="This will be invisible to {{.Username}}, but everyone else will be able to see it and possibly claim it."
-              required>
+            <input class="form-control" name="gift_name" required aria-describedby="gift_name_help">
             <button class="btn btn-primary" type="submit" name="intent" value="add">Add gift idea</button>
           </div>
+          <div id="gift_name_help" class="form-text">This will be invisible to {{.Username}}, but everyone else will be
+            able to see it and
+            possibly claim it.</div>
         </form>
       </div>
     </section>
   </div>
 </div>
-{{end}}
+{{end}}
\ No newline at end of file
diff --git a/templates/home.gotmpl b/templates/home.gotmpl
index 503e4b5..295243b 100644
--- a/templates/home.gotmpl
+++ b/templates/home.gotmpl
@@ -54,10 +54,10 @@
       </div>
     </section>
 
-    {{with .Todo}}
     <section class="card">
       <div class="card-body">
         <h2>Your todo list</h2>
+        {{with .Todo}}
         <form method="post"
           onchange="acceptNames(this, 'unclaimSubmit', 'gift'); acceptNames(this, 'completeSubmit', 'gift')"
           autocomplete="off">
@@ -86,9 +86,11 @@
           <button id="completeSubmit" class="btn btn-success" type="submit" name="mode" value="complete_todo"
             disabled>Complete</button>
         </form>
+        {{else}}
+        <p class="mb-0">When you claim gifts for others, they will appear here.</p>
+        {{end}}
       </div>
     </section>
-    {{end}}
   </div>
 </div>
-{{end}}
\ No newline at end of file
+{{end}}