diff --git a/ember/app/components/index/discussion-listing.js b/ember/app/components/index/discussion-listing.js
index 2631eacbc..75761364d 100755
--- a/ember/app/components/index/discussion-listing.js
+++ b/ember/app/components/index/discussion-listing.js
@@ -9,7 +9,6 @@ import FadeIn from 'flarum/mixins/fade-in';
  */
 export default Ember.Component.extend(FadeIn, HasItemLists, {
   layoutName: 'components/index/discussion-listing',
-  tagName: 'li',
   attributeBindings: ['discussionId:data-id'],
   classNames: ['discussion-summary'],
   classNameBindings: [
diff --git a/ember/app/styles/flarum/index.less b/ember/app/styles/flarum/index.less
index 91f992b77..3256916ba 100644
--- a/ember/app/styles/flarum/index.less
+++ b/ember/app/styles/flarum/index.less
@@ -105,13 +105,13 @@
 }
 
 @media @phone, @tablet {
-  .index-results {
+  .offset-content {
     margin-top: 15px;
   }
 }
 
 @media @desktop, @desktop-hd {
-  .index-results {
+  .offset-content {
     margin-top: 30px;
     margin-left: 225px;
   }
@@ -228,16 +228,6 @@
     & > li {
       margin-right: -25px;
       padding-right: 65px + 25px;
-
-      & .contextual-controls {
-        position: absolute;
-        right: 0;
-        top: 18px;
-        visibility: hidden;
-      }
-      &:hover .contextual-controls, & .contextual-controls.open {
-        visibility: visible;
-      }
     }
   }
 }
@@ -249,9 +239,18 @@
     color: @fl-body-muted-color;
     text-decoration: none;
   }
+  & .contextual-controls {
+    visibility: hidden;
+    position: absolute;
+    right: 0;
+    top: 18px;
+  }
+  &:hover .contextual-controls, & .contextual-controls.open {
+    visibility: visible;
+  }
   & .author {
     float: left;
-    margin-top: 20px;
+    margin-top: 18px;
   }
   & .badges {
     float: left;
diff --git a/ember/app/templates/components/index/discussion-listing.hbs b/ember/app/templates/components/index/discussion-listing.hbs
index dd237882e..2f7fd9060 100644
--- a/ember/app/templates/components/index/discussion-listing.hbs
+++ b/ember/app/templates/components/index/discussion-listing.hbs
@@ -11,7 +11,7 @@
 
 {{ui/item-list items=discussion.badges class="badges"}}
 
-{{#link-to "discussion" discussion.content (query-params start=start) current-when="discussion" class="main"}}
+{{#link-to "discussion" discussion (query-params start=start) current-when="discussion" class="main"}}
   <h3 class="title">{{highlight-words discussion.title searchQuery}}</h3>
   {{ui/item-list items=info class="info"}}
 {{/link-to}}
@@ -27,7 +27,7 @@
 {{#if relevantPosts}}
   <div class="relevant-posts">
     {{#each post in relevantPosts}}
-      {{#link-to "discussion" discussion.content (query-params start=post.number) class="post item"}}
+      {{#link-to "discussion" discussion (query-params start=post.number) class="post item"}}
         {{user-avatar post.user class="avatar-thumb"}}
         <span class="post-body">{{highlight-words post.relevantContent searchQuery}}</span>
       {{/link-to}}
diff --git a/ember/app/templates/index.hbs b/ember/app/templates/index.hbs
index 1d0e0152f..4a32da04b 100644
--- a/ember/app/templates/index.hbs
+++ b/ember/app/templates/index.hbs
@@ -10,7 +10,7 @@
       {{ui/item-list items=view.sidebar}}
     </nav>
 
-    <div class="index-results">
+    <div class="offset-content index-results">
 
       <div class="index-toolbar">
         <div class="index-toolbar-view">
@@ -29,7 +29,8 @@
       <ul class="discussions-list">
         {{#each discussion in index.model}}
           {{index/discussion-listing
-            discussion=discussion
+            tagName="li"
+            discussion=discussion.content
             searchQuery=index.searchQuery
             terminalPostType=index.terminalPostType
             countType=index.countType
@@ -39,14 +40,10 @@
 
       {{#if index.resultsLoading}}
         {{ui/loading-indicator size="small"}}
-      {{/if}}
-
-      {{#if index.moreResults}}
-        {{#unless index.resultsLoading}}
-          <div class="load-more">
-            {{ui/action-button class="control-loadMore btn btn-default" action="loadMore" label="Load More"}}
-          </div>
-        {{/unless}}
+      {{else if index.moreResults}}
+        <div class="load-more">
+          {{ui/action-button class="control-loadMore btn btn-default" action="loadMore" label="Load More"}}
+        </div>
       {{/if}}
 
     </div>