diff --git a/models/Story.js b/models/Story.js
index 072a9dc3b5..d5d163ccf1 100644
--- a/models/Story.js
+++ b/models/Story.js
@@ -46,13 +46,4 @@ var storySchema = new mongoose.Schema({
     }
 });
 
-module.exports = mongoose.model('Story', storySchema);
-
-/*
- author: {
- userId: {
- type: mongoose.Schema.Types.ObjectId,
- ref: 'User'
- }
- },
- */
+module.exports = mongoose.model('Story', storySchema);
\ No newline at end of file
diff --git a/views/stories/hot-stories.jade b/views/stories/hot-stories.jade
index 7839ef1204..e71118b6f9 100644
--- a/views/stories/hot-stories.jade
+++ b/views/stories/hot-stories.jade
@@ -34,7 +34,7 @@
                                         "<div class='row'>" +
                                             "<div class='story-headline col-xs-12'>" +
                                                 "<a href='/stories/" + linkedName + "'>"
-                                                    + data[i].storyLink +
+                                                    + data[i].headline +
                                                 "</a>" +
                                             "</div>" +
                                             "<div class='col-xs-12'>" +
diff --git a/views/stories/new-stories.jade b/views/stories/new-stories.jade
index 6c95274db9..f89f5b5b13 100644
--- a/views/stories/new-stories.jade
+++ b/views/stories/new-stories.jade
@@ -34,7 +34,7 @@
                                         "<div class='row'>" +
                                             "<div class='story-headline col-xs-12'>" +
                                                 "<a href='/stories/" + linkedName + "'>"
-                                                    + data[i].storyLink +
+                                                    + data[i].headline +
                                                 "</a>" +
                                             "</div>" +
                                             "<div class='col-xs-12'>" +
diff --git a/views/stories/search-stories.jade b/views/stories/search-stories.jade
index 9574bf4b9f..15672bdb5e 100644
--- a/views/stories/search-stories.jade
+++ b/views/stories/search-stories.jade
@@ -4,7 +4,7 @@
     .input-group
         input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our stories', autofocus)
         span.input-group-btn
-            button.disabled#searchbutton.btn.btn-big.btn-primary.btn-responsive(type='button') Search
+            button#searchbutton.btn.btn-big.btn-primary.btn-responsive(type='button') Search
     .spacer
 
 #story-list
diff --git a/views/stories/show.jade b/views/stories/show.jade
index 18218529e2..2ee65b3290 100644
--- a/views/stories/show.jade
+++ b/views/stories/show.jade
@@ -38,7 +38,7 @@
                         .negative-5
                             span Posted #{timeAgo}
                             span &thinsp;by&thinsp;
-                                a(href="/" + author.username)@#{author.username}
+                                a(href="/" + author.username) @#{author.username}
                                 |  &nbsp;·&nbsp;
                                 a#reply-to-main-post Reply
     .col-xs-12#reply-area