diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index b1444ec886b..f1a74708877 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -343,6 +343,9 @@ a.star {
 }
 
   .topic-links {
+    li > a {
+      margin-left: 5px;
+    }
     .badge-notification {
       margin: 0 0 4px;
     }
@@ -636,7 +639,7 @@ blockquote {
 }
 
 .info-line {
-  margin: 10px 0; 
+  margin: 10px 0;
   color: #666;
 }
 
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index dde70bc87d1..d80aa066c8a 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -2,7 +2,7 @@
 .post-info a {color: #aaa;}
 
 .topic-meta-data-inside {
-  float: right; 
+  float: right;
   margin-top: -19px;
   font-size: 12px;
 }
@@ -60,7 +60,7 @@ i {
   margin-right: 5px;
   background: #fff;
   border: 1px solid #ddd;
-  padding: 2px 4px; 
+  padding: 2px 4px;
   border-radius: 20px;
   transition: linear 0.15s;
   -webkit-transition: linear 0.15s;
@@ -70,7 +70,7 @@ i {
 }
 
 a.reply-new {color: #aaa;}
-a:hover.reply-new {color: #56aed3; 
+a:hover.reply-new {color: #56aed3;
 
 i {background: #e4f2f8;
   border: 1px solid #e4f2f8;
@@ -169,4 +169,16 @@ i {background: #e4f2f8;
 .heatmap-low {color: #700 !important;}
 
 .onebox-result {margin-top: 15px;}
-.source .info {padding-right: 10px;}
\ No newline at end of file
+.source .info {padding-right: 10px;}
+
+
+
+#topic-filter {
+  background-color: #ffe;
+  padding: 8px;
+  bottom: 0;
+  position: fixed;
+  width: 100%;
+  font-size: 15px;
+  z-index: 495
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 7c69476221f..8495e262ecb 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -219,6 +219,7 @@ a.star {
     padding: 7px 14px;
     color: #000;
   }
+
   .information {
     border-top: 1px solid #d1d1d2;
   }
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 829e6bee72e..192d17bbe08 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -139,5 +139,3 @@ a.edit-topic {font-size: 15px;}
 .heatmap-high {color: #f77 !important;}
 .heatmap-med {color: #a00 !important;}
 .heatmap-low {color: #700 !important;}
-
-
diff --git a/vendor/assets/javascripts/better_markdown.js b/vendor/assets/javascripts/better_markdown.js
index 01f3d6c99ad..93555f4c570 100644
--- a/vendor/assets/javascripts/better_markdown.js
+++ b/vendor/assets/javascripts/better_markdown.js
@@ -174,12 +174,14 @@
     return md.toTree( source );
   };
 
+  /**
+   *  count_lines( str ) -> count
+   *  - str (String): String whose lines we want to count
+   *
+   *  Counts the number of linebreaks in `str`
+   **/
   function count_lines( str ) {
-    var n = 0,
-        i = -1;
-    while ( ( i = str.indexOf("\n", i + 1) ) !== -1 )
-      n++;
-    return n;
+    return str.split("\n").length - 1;
   }
 
   // Internal - split source into rough blocks