diff --git a/templates/foreign_wishlist.gotmpl b/templates/foreign_wishlist.gotmpl
index fa1c74e..2dff137 100644
--- a/templates/foreign_wishlist.gotmpl
+++ b/templates/foreign_wishlist.gotmpl
@@ -7,39 +7,45 @@
     </li>
   </ul>
 </nav>
-<h2>{{.Username}}'s list</h2>
-<form method="post" action="/{{.UserReference}}/update" autocomplete="off"
-  onchange="acceptNames(this, 'claimSubmit', 'claimed', 'unclaimed'); acceptNames(this, 'completeSubmit', 'claimed');">
-  <button id="claimSubmit" type="submit" name="mode" value="claim" disabled>Claim/Unclaim</button>
-  <button id="completeSubmit" type="submit" name="mode" value="complete" disabled>Complete</button>
-  <ul>
-    {{range .Gifts}}
-    <li>
-      <label>
-        {{if .ClaimantId}}
-        {{if eq .ClaimantId $.CurrentUserId}}
-        <input type="checkbox" name="claimed" value="{{.Id}}" {{if .Sent}}disabled{{end}}>
-        {{else}}
-        <input type="checkbox" disabled>
-        {{end}}
-        {{else}}
-        <input type="checkbox" name="unclaimed" value="{{.Id}}" {{if .Sent}}disabled{{end}}>
-        {{end}}
-        {{if .Sent}}
-        <s>{{.Name}}</s>
-        {{else}}
-        {{.Name}}
-        {{end}}
-        {{if .ClaimantId}}
-        {{if eq .ClaimantId $.CurrentUserId}}
-        <span style="color: blue;">{{if .Sent}}Completed{{else}}Claimed{{end}} by you</span>
-        {{else}}
-        <span style="color: red;">{{if .Sent}}Completed{{else}}Claimed{{end}} by {{.ClaimantName}}</span>
-        {{end}}
-        {{end}}
-      </label>
-    </li>
-    {{end}}
-  </ul>
-</form>
+<section>
+  <h2>{{.Username}}'s list</h2>
+  {{with .Gifts}}
+  <form method="post" action="/{{$.UserReference}}/update" autocomplete="off"
+    onchange="acceptNames(this, 'claimSubmit', 'claimed', 'unclaimed'); acceptNames(this, 'completeSubmit', 'claimed');">
+    <button id="claimSubmit" type="submit" name="mode" value="claim" disabled>Claim/Unclaim</button>
+    <button id="completeSubmit" type="submit" name="mode" value="complete" disabled>Complete</button>
+    <ul>
+      {{range .}}
+      <li>
+        <label>
+          {{if .ClaimantId}}
+          {{if eq .ClaimantId $.CurrentUserId}}
+          <input type="checkbox" name="claimed" value="{{.Id}}" {{if .Sent}}disabled{{end}}>
+          {{else}}
+          <input type="checkbox" disabled>
+          {{end}}
+          {{else}}
+          <input type="checkbox" name="unclaimed" value="{{.Id}}" {{if .Sent}}disabled{{end}}>
+          {{end}}
+          {{if .Sent}}
+          <s>{{.Name}}</s>
+          {{else}}
+          {{.Name}}
+          {{end}}
+          {{if .ClaimantId}}
+          {{if eq .ClaimantId $.CurrentUserId}}
+          <span style="color: blue;">{{if .Sent}}Completed{{else}}Claimed{{end}} by you</span>
+          {{else}}
+          <span style="color: red;">{{if .Sent}}Completed{{else}}Claimed{{end}} by {{.ClaimantName}}</span>
+          {{end}}
+          {{end}}
+        </label>
+      </li>
+      {{end}}
+    </ul>
+  </form>
+  {{else}}
+  <p>They haven't wished for anything. Ask them to think of some stuff!</p>
+  {{end}}
+</section>
 {{end}}
\ No newline at end of file
diff --git a/templates/home.gotmpl b/templates/home.gotmpl
index e723afc..ddc6b2e 100644
--- a/templates/home.gotmpl
+++ b/templates/home.gotmpl
@@ -10,48 +10,59 @@
     <pre>{{.Reference}}</pre>
   </dd>
 </dl>
-<h2>Your wishlist</h2>
-<form method="post" action="/wishlist/delete" onchange="acceptNames(this, 'deleteSubmit', 'gift')" autocomplete="off">
-  <button id="deleteSubmit" type="submit" name="mode" value="delete" disabled>Delete</button>
-  <ul>
-    {{range .Gifts}}
-    <li>
-      <label>
-        <input type="checkbox" name="gift" value="{{.Id}}">
-        {{.Name}}
-      </label>
-    </li>
-    {{end}}
-  </ul>
-</form>
-<form method="post" action="/wishlist/add">
-  <input name="gift_name" required>
-  <button type="submit">Add gift idea</button>
-</form>
-<h2>Your todo list</h2>
-<form method="post" action="/todo/update"
-  onchange="acceptNames(this, 'unclaimSubmit', 'gift'); acceptNames(this, 'completeSubmit', 'gift')" autocomplete="off">
-  <button id="unclaimSubmit" type="submit" name="mode" value="unclaim" disabled>Unclaim</button>
-  <button id="completeSubmit" type="submit" name="mode" value="complete" disabled>Complete</button>
-  <ul>
-    {{range .Todo}}
-    <li>
-      <label>
-        {{if .Sent}}
-        <input type="checkbox" disabled>
-        {{else}}
-        <input type="checkbox" name="gift" value="{{.Id}}">
-        {{end}}
-        <em>
-          {{if .Sent}}
-          <s>{{.Name}}</s>
-          {{else}}
+<section>
+  <h2>Your wishlist</h2>
+  {{with .Gifts}}
+  <form method="post" action="/wishlist/delete" onchange="acceptNames(this, 'deleteSubmit', 'gift')" autocomplete="off">
+    <button id="deleteSubmit" type="submit" name="mode" value="delete" disabled>Delete</button>
+    <ul>
+      {{range .}}
+      <li>
+        <label>
+          <input type="checkbox" name="gift" value="{{.Id}}">
           {{.Name}}
+        </label>
+      </li>
+      {{end}}
+    </ul>
+  </form>
+  {{else}}
+  <p>Your list is empty. Think of some things to add!</p>
+  {{end}}
+  <form method="post" action="/wishlist/add">
+    <input name="gift_name" required>
+    <button type="submit">Add gift idea</button>
+  </form>
+</section>
+{{with .Todo}}
+<section>
+  <h2>Your todo list</h2>
+  <form method="post" action="/todo/update"
+    onchange="acceptNames(this, 'unclaimSubmit', 'gift'); acceptNames(this, 'completeSubmit', 'gift')"
+    autocomplete="off">
+    <button id="unclaimSubmit" type="submit" name="mode" value="unclaim" disabled>Unclaim</button>
+    <button id="completeSubmit" type="submit" name="mode" value="complete" disabled>Complete</button>
+    <ul>
+      {{range .}}
+      <li>
+        <label>
+          {{if .Sent}}
+          <input type="checkbox" disabled>
+          {{else}}
+          <input type="checkbox" name="gift" value="{{.Id}}">
           {{end}}
-        </em> for <a href="/{{.RecipientRef}}">{{.RecipientName}}</a>
-      </label>
-    </li>
-    {{end}}
-  </ul>
-</form>
+          <em>
+            {{if .Sent}}
+            <s>{{.Name}}</s>
+            {{else}}
+            {{.Name}}
+            {{end}}
+          </em> for <a href="/{{.RecipientRef}}">{{.RecipientName}}</a>
+        </label>
+      </li>
+      {{end}}
+    </ul>
+  </form>
+</section>
+{{end}}
 {{end}}
\ No newline at end of file