diff --git a/public/css/main.less b/public/css/main.less
index 37fc8a39ce..14be443d72 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -751,7 +751,7 @@ iframe.iphone {
   margin-bottom: 50px;
 }
 
-.btn-primary-ghost{
+.btn-primary-ghost {
   background: transparent;
   color: @brand-primary;
 
@@ -833,6 +833,10 @@ iframe.iphone {
   font-size: 20px;
 }
 
+#reply-to-main-post, #upvote {
+  cursor: pointer;
+}
+
 
 //uncomment this to see the dimensions of all elements outlined in red
 //* {
diff --git a/views/stories/hot-stories.jade b/views/stories/hot-stories.jade
index e71118b6f9..9d1ad48cb1 100644
--- a/views/stories/hot-stories.jade
+++ b/views/stories/hot-stories.jade
@@ -33,13 +33,14 @@
                                     "<div class='col-xs-9 col-sm-10'>" +
                                         "<div class='row'>" +
                                             "<div class='story-headline col-xs-12'>" +
-                                                "<a href='/stories/" + linkedName + "'>"
-                                                    + data[i].headline +
+                                                "<a href='" + data[i].link + "'>" +
+                                                    data[i].headline +
                                                 "</a>" +
                                             "</div>" +
                                             "<div class='col-xs-12'>" +
                                                 "<span>" +
-                                                    rank + " points, posted " +
+                                                    "<a class='btn btn-primary btn-xs btn-primary-ghost' href='/stories/" + linkedName + "'>discuss</a>&nbsp;&nbsp;&nbsp;&nbsp;" +
+                                                    rank + (rank > 1 ? " points" : " point") + ", posted " +
                                                     moment(data[i].timePosted).fromNow() +
                                                     " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +
                                                 "</span>" +
diff --git a/views/stories/new-stories.jade b/views/stories/new-stories.jade
index f89f5b5b13..0bc727af62 100644
--- a/views/stories/new-stories.jade
+++ b/views/stories/new-stories.jade
@@ -33,13 +33,14 @@
                                     "<div class='col-xs-9 col-sm-10'>" +
                                         "<div class='row'>" +
                                             "<div class='story-headline col-xs-12'>" +
-                                                "<a href='/stories/" + linkedName + "'>"
-                                                    + data[i].headline +
+                                                "<a href='" + data[i].link + "'>" +
+                                                    data[i].headline +
                                                 "</a>" +
                                             "</div>" +
                                             "<div class='col-xs-12'>" +
                                                 "<span>" +
-                                                    rank + " points, posted " +
+                                                    "<a class='btn btn-primary btn-xs btn-primary-ghost' href='/stories/" + linkedName + "'>discuss</a>&nbsp;&nbsp;&nbsp;&nbsp;" +
+                                                    rank + (rank > 1 ? " points" : " point") + ", posted " +
                                                     moment(data[i].timePosted).fromNow() +
                                                     " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +
                                                 "</span>" +