diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 7f1a03f6da..0f6263b969 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -45,6 +45,9 @@ form label {
       margin-left: 5px;
     }
   }
+  .blank {
+    margin: 2%;
+  }
   //SORTING
   .discussion-sort {
     float: right;
@@ -237,12 +240,10 @@ form label {
   }
   .discussion-content-edit, .discussion-reply-new, .new-post-form {
     margin: 10px 0 10px 0;
-    a {
-      &:hover {
-        color: #1C71DD;
-        text-decoration: none;
-      };
-    }
+    a:hover {
+      color: #1C71DD;
+      text-decoration: none;
+    };
     .new-post-control {
       margin-left: 80%;
       margin-top: 1%;
diff --git a/lms/templates/discussion/_blank_slate.html b/lms/templates/discussion/_blank_slate.html
index e08a45cc70..b8c8f58dda 100644
--- a/lms/templates/discussion/_blank_slate.html
+++ b/lms/templates/discussion/_blank_slate.html
@@ -1,7 +1,7 @@
 <div class="blank-state">
   % if performed_search:
-    There is no result matching your search parameters.
+    Sorry! We can't find anything matching your search. Please try another search.
   % else:
-    There is no post here yet. Be the first one to post!
+    There are no posts here yet. Be the first one to post!
   % endif
 </div>
diff --git a/lms/templates/discussion/_forum.html b/lms/templates/discussion/_forum.html
index b7d72b631c..cff3b6c1f9 100644
--- a/lms/templates/discussion/_forum.html
+++ b/lms/templates/discussion/_forum.html
@@ -14,18 +14,20 @@
     </div>
     <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
   </div>
-  <%include file="_sort.html" />
   % if len(threads) == 0:
-    <%include file="_blank_slate.html" />
+    <div class="blank">
+      <%include file="_blank_slate.html" />
+    </div>
     <div class="threads"></div>
   % else:
+    <%include file="_sort.html" />
     <div class="threads">
       % for thread in threads:
         ${renderer.render_thread(course_id, thread, show_comments=False)}
       % endfor
     </div>
+    <%include file="_paginator.html" />
   % endif
-  <%include file="_paginator.html" />
 </section>
 
 <%!
diff --git a/lms/templates/discussion/_inline.html b/lms/templates/discussion/_inline.html
index 362523f7fc..306df5c0af 100644
--- a/lms/templates/discussion/_inline.html
+++ b/lms/templates/discussion/_inline.html
@@ -6,19 +6,21 @@
       <%include file="_search_bar.html" />
     </div>
     <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
-    <%include file="_sort.html" />
   </div>
   % if len(threads) == 0:
-    <%include file="_blank_slate.html" />
+    <div class="blank">
+      <%include file="_blank_slate.html" />
+    </div>
     <div class="threads"></div>
   % else:
+    <%include file="_sort.html" />
     <div class="threads">
       % for thread in threads:
         ${renderer.render_thread(course_id, thread, show_comments=False)}
       % endfor
     </div>
+    <%include file="_paginator.html" />
   % endif
-  <%include file="_paginator.html" />
 </section>
 
 <%!