diff --git a/static/css/details.css b/static/css/details.css
index 578372e4..030a833c 100644
--- a/static/css/details.css
+++ b/static/css/details.css
@@ -6,6 +6,10 @@
     margin-bottom: 24px;
 }
 
+#details-head h1 small {
+    font-size: 12px;
+}
+
 .details-block .status {
     font-size: 32px;
     width: 40px;
diff --git a/static/js/details.js b/static/js/details.js
index 6187ed75..b92192f2 100644
--- a/static/js/details.js
+++ b/static/js/details.js
@@ -6,6 +6,13 @@ $(function () {
         return false;
     });
 
+    $("#edit-desc").click(function() {
+        $('#update-name-modal').modal("show");
+        $("#update-desc-input").focus();
+
+        return false;
+    });
+
     $("#pause").click(function(e) {
         $("#pause-form").submit();
         return false;
diff --git a/templates/front/details.html b/templates/front/details.html
index 74676335..44ef2ef9 100644
--- a/templates/front/details.html
+++ b/templates/front/details.html
@@ -10,7 +10,7 @@
     <div id="details-head" class="col-sm-12">
         <h1>
             {{ check.name_then_code }}
-            <button id="edit-name" class="btn btn-sm btn-default">Edit</button>
+            <small><a id="edit-name" href="#">(edit&hellip;)</a></small>
         </h1>
         <span class="label label-tag">{{ check.project }}</span>
         {% for tag in check.tags_list %}
@@ -27,13 +27,19 @@
     {% endif %}
 
     <div class="col-sm-5">
-        {% if check.desc %}
         <div class="details-block">
             <h2>Description</h2>
+            {% if check.desc %}
             {{ check.desc|linebreaks|urlize }}
+            <div class="text-right">
+                <button id="edit-desc" class="btn btn-sm btn-default">
+                    Edit Description&hellip;
+                </button>
+            </div>
+            {% else %}
+            <small><a id="edit-desc" href="#">Add description&hellip;</a></small>
+            {% endif %}
         </div>
-        {% endif %}
-
 
         <div class="details-block">
             <h2>How To Ping</h2>
diff --git a/templates/front/update_name_modal.html b/templates/front/update_name_modal.html
index 52dca802..04956aa9 100644
--- a/templates/front/update_name_modal.html
+++ b/templates/front/update_name_modal.html
@@ -63,6 +63,9 @@
                                 id="update-desc-input"
                                 class="form-control"
                                 rows="5"
+                                placeholder="What's being monitored?
+What to do when this check goes down?
+Where to find more information?"
                                 name="desc">{{ check.desc }}</textarea>
                         </div>
                     </div>