diff --git a/conservancy/usethesource/templates/usethesource/candidate.html b/conservancy/usethesource/templates/usethesource/candidate.html
index 8d396d227e3ffdcf6c14dd1fac086cfd41b3dc19..e4a20ca6a610502c604a70774ad06fad5f8dd460 100644
--- a/conservancy/usethesource/templates/usethesource/candidate.html
+++ b/conservancy/usethesource/templates/usethesource/candidate.html
@@ -1,5 +1,7 @@
 {% extends "usethesource/base.html" %}
 
+{% block title %}{{ candidate.name }} - Software Freedom Conservancy{% endblock %}
+
 {% block head %}
   {{ block.super }}
   <script src="https://unpkg.com/htmx.org@1.9.6"></script>
@@ -11,10 +13,14 @@
   <section class="pa2 mt4 mb3">
     <div style="display: flex; justify-content: space-between">
       <div>
-        <h2 class="f2 lh-title ttu mt0">{{ candidate.name }}</h2>
-        <p><strong>Vendor</strong>: {{ candidate.vendor }}</em></p>
-        <p><strong>Device</strong>: {{ candidate.device }}</em></p>
-        <p><strong>Released</strong>: {{ candidate.release_date }}</em></p>
+        <div class="flex items-center">
+          <h2 class="f2 lh-title ttu mt0">{{ candidate.name }}</h2>
+          <a href="{% url 'admin:usethesource_candidate_change' object_id=candidate.id %}" title="Edit candidate" class="f3 white bg-light-silver db ph2 mh2 mb3" style="transform: scaleX(-1); text-decoration: none !important">✎</a>
+        </div>
+
+        <p><strong>Vendor</strong>: {{ candidate.vendor }}</p>
+        <p><strong>Device</strong>: {{ candidate.device }}</p>
+        <p><strong>Released</strong>: {{ candidate.release_date }}</p>
       </div>
       <div class="mt2">
         <div><a href="{% url 'usethesource:download' slug=candidate.slug download_type='source' %}" class="white bg-green db pv2 ph3 mb2">Download source</a></div>
@@ -22,12 +28,14 @@
       </div>
     </div>
 
-    <p>{{ candidate.description }}</p>
+    {{ candidate.description|linebreaks }}
 
-    <h3 class="f3 lh-title mt4">Comments</h3>
-    {% for comment in candidate.comment_set.all %}
-      {% include "usethesource/comment_partial.html" %}
-    {% endfor %}
+    {% with comments=candidate.comment_set.all %}
+      {% if comments or user.is_staff %}<h3 class="f3 lh-title mt4">Comments</h3>{% endif %}
+      {% for comment in comments %}
+        {% include "usethesource/comment_partial.html" %}
+      {% endfor %}
+    {% endwith %}
 
     {% if user.is_staff %}
       {% include "usethesource/add_comment_button_partial.html" %}