diff --git a/templates/foreign_wishlist.gotmpl b/templates/foreign_wishlist.gotmpl
index 2dff137..0548108 100644
--- a/templates/foreign_wishlist.gotmpl
+++ b/templates/foreign_wishlist.gotmpl
@@ -20,26 +20,29 @@
         <label>
           {{if .ClaimantId}}
           {{if eq .ClaimantId $.CurrentUserId}}
-          <input type="checkbox" name="claimed" value="{{.Id}}" {{if .Sent}}disabled{{end}}>
+          <input type="checkbox" aria-describedby="wish_detail_{{.Id}}" name="claimed" value="{{.Id}}" {{if
+            .Sent}}disabled{{end}}>
           {{else}}
-          <input type="checkbox" disabled>
+          <input type="checkbox" aria-describedby="wish_detail_{{.Id}}" disabled>
           {{end}}
           {{else}}
-          <input type="checkbox" name="unclaimed" value="{{.Id}}" {{if .Sent}}disabled{{end}}>
+          <input type="checkbox" aria-describedby="wish_detail_{{.Id}}" 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>
+        {{if .ClaimantId}}
+        {{if eq .ClaimantId $.CurrentUserId}}
+        <span id="wish_detail_{{.Id}}" style="color: blue;">{{if .Sent}}Completed{{else}}Claimed{{end}} by you</span>
+        {{else}}
+        <span id="wish_detail_{{.Id}}" style="color: red;">{{if .Sent}}Completed{{else}}Claimed{{end}} by
+          {{.ClaimantName}}</span>
+        {{end}}
+        {{end}}
       </li>
       {{end}}
     </ul>
diff --git a/templates/home.gotmpl b/templates/home.gotmpl
index ddc6b2e..92c7ae5 100644
--- a/templates/home.gotmpl
+++ b/templates/home.gotmpl
@@ -47,7 +47,7 @@
       <li>
         <label>
           {{if .Sent}}
-          <input type="checkbox" disabled>
+          <input aria-describedby="todo_detail_{{.Id}}" type="checkbox" disabled>
           {{else}}
           <input type="checkbox" name="gift" value="{{.Id}}">
           {{end}}
@@ -57,8 +57,11 @@
             {{else}}
             {{.Name}}
             {{end}}
-          </em> for <a href="/{{.RecipientRef}}">{{.RecipientName}}</a>
+          </em>
         </label>
+        <span id="todo_detail_{{.Id}}">
+          for <a href="/{{.RecipientRef}}">{{.RecipientName}}</a>
+        </span>
       </li>
       {{end}}
     </ul>