diff --git a/layouts/partials/picture.html b/layouts/partials/picture.html
index 835f66b..abe15be 100644
--- a/layouts/partials/picture.html
+++ b/layouts/partials/picture.html
@@ -3,10 +3,16 @@
         <img src="{{ .thumb }}" alt="" />
     </a>
     <div class="caption">
-        <h3>{{ .title }}</h3>
-        <p>{{ .content }}</p>
+        {{ with .title }}
+        <h3>{{ . }}</h3>
+        {{ end }}
+        {{ with .content }}
+        <p>{{ . }}</p>
+        {{ end }}
+        {{ with .button }}
         <ul class="actions fixed">
-            <li><span class="button small">{{ .button }}</span></li>
+            <li><span class="button small">{{ . }}</span></li>
         </ul>
+        {{ end }}
     </div>
 </article>