diff --git a/src/helpers.cr b/src/helpers.cr
index e4674c3e..a8beb16f 100644
--- a/src/helpers.cr
+++ b/src/helpers.cr
@@ -321,12 +321,12 @@ def template_comments(root)
 
       content = <<-END_HTML
       <p>
-        <a class="link" href="javascript:void(0)" onclick="dismiss(this.parentNode.parentNode)">[ - ]</a> 
-        #{score} 
-        <b>#{author}</b> 
+        <a class="link" href="javascript:void(0)" onclick="toggle(this)">[ - ]</a> #{score} <b>#{author}</b> 
       </p>
-      <p>#{body_html}</p>
+      <div>
+      #{body_html}
       #{replies_html}
+      </div>
       END_HTML
 
       if child["data"]["depth"].as_i > 0
diff --git a/src/views/watch.ecr b/src/views/watch.ecr
index 4e75cc7e..f2a205d5 100644
--- a/src/views/watch.ecr
+++ b/src/views/watch.ecr
@@ -61,8 +61,15 @@ var player = videojs('player', options, function() {
   });
 });
 
-function dismiss(target) {
-    target.style.display = 'none';
+function toggle(target) {
+    body = target.parentNode.parentNode.children[1];
+    if (body.style.display === null || body.style.display === '') {
+        target.innerHTML = '[ + ]';
+        body.style.display = 'none';
+    } else {
+        target.innerHTML = '[ - ]';
+        body.style.display = '';
+    }
 }
 </script>