diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss
index f026c31148..a12f7bb6f5 100644
--- a/sass/_askbot-original.scss
+++ b/sass/_askbot-original.scss
@@ -417,17 +417,17 @@ body.anon #searchBar {
     padding-left: 0px; }
   .contributorback {
     background: #eceeeb url(../images/contributorsback.png) no-repeat center left; }
-  label {
-    color: #707070;
-    font-size: 15px;
-    display: block;
-    float: right;
-    text-align: left;
-    font-family: 'Yanone Kaffeesatz',sans-serif;
-    width: 80px;
-    margin-right: 18px; }
-  #displayTagFilterControl label {
-    width: 160px; }
+  // label {
+  //   color: #707070;
+  //   font-size: 15px;
+  //   display: block;
+  //   float: right;
+  //   text-align: left;
+  //   font-family: 'Yanone Kaffeesatz',sans-serif;
+  //   width: 80px;
+  //   margin-right: 18px; }
+  // #displayTagFilterControl label {
+  //   width: 160px; }
   ul {
     margin-left: 22px; }
   li {
@@ -640,15 +640,15 @@ body.anon #searchBar {
   // &:hover {
   //   color: #F4A731 !important; } }
 
-#questionCount {
-  font-weight: bold;
-  font-size: 23px;
-  color: #7ea9b3;
-  width: 200px;
-  float: left;
-  margin-bottom: 8px;
-  padding-top: 6px;
-  font-family: 'Yanone Kaffeesatz',sans-serif; }
+// #questionCount {
+//   font-weight: bold;
+//   font-size: 23px;
+//   color: #7ea9b3;
+//   width: 200px;
+//   float: left;
+//   margin-bottom: 8px;
+//   padding-top: 6px;
+//   font-family: 'Yanone Kaffeesatz',sans-serif; }
 
 #listSearchTags {
   float: left;
@@ -2679,29 +2679,29 @@ pre.prettyprint {
   padding: 3px;
   border: 0px solid #888; }
 
-@media print {
-  .str {
-    color: #060; }
-  .kwd {
-    color: #006;
-    font-weight: bold; }
-  .com {
-    color: #600;
-    font-style: italic; }
-  .typ {
-    color: #404;
-    font-weight: bold; }
-  .lit {
-    color: #044; }
-  .pun {
-    color: #440; }
-  .pln {
-    color: #000; }
-  .tag {
-    color: #006;
-    font-weight: bold; }
-  .atn {
-    color: #404; }
-  .atv {
-    color: #060; } }
+// @media print {
+//   .str {
+//     color: #060; }
+//   .kwd {
+//     color: #006;
+//     font-weight: bold; }
+//   .com {
+//     color: #600;
+//     font-style: italic; }
+//   .typ {
+//     color: #404;
+//     font-weight: bold; }
+//   .lit {
+//     color: #044; }
+//   .pun {
+//     color: #440; }
+//   .pln {
+//     color: #000; }
+//   .tag {
+//     color: #006;
+//     font-weight: bold; }
+//   .atn {
+//     color: #404; }
+//   .atv {
+//     color: #060; } }
 
diff --git a/sass/_discussion-questions.scss b/sass/_discussion-questions.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sass/_discussion.scss b/sass/_discussion.scss
index 5ba969063b..c19bf06fd4 100644
--- a/sass/_discussion.scss
+++ b/sass/_discussion.scss
@@ -18,7 +18,7 @@ body.askbot {
         &.question-filter {
           font-size:16px;
           margin-top: 4px;
-          width: grid-width(4);
+          width: flex-grid(4);
 
           ul {
             @include border-radius(35px);
@@ -52,26 +52,30 @@ body.askbot {
         &.search-box {
           margin-left:2%;
           text-align:right;
-          width: grid-width(8);
+          width: flex-grid(8);
+
+          input[type="text"] {
+            margin-right: 6px;
+            width: flex-grid(2,8);
+          }
         }
 
       }
     }
   }
 
-  .main-content {
-    .discussion-wrapper {
-      display: table;
-      width: 100%;
+  section.main-content {
+    div.discussion-wrapper {
+      @extend .table-wrapper;
 
-      .discussion-content {
+      div.discussion-content {
         @include box-sizing(border-box);
         display: table-cell;
         padding: $gw-gutter;
         vertical-align: top;
-        width: grid-width(9);
+        width: flex-grid(9);
 
-        .order-sort {
+        div.order-sort {
           @include border-radius(35px);
           background-color: lighten(#F6EFD4, 5%) ;
           height: 30px;
@@ -96,18 +100,21 @@ body.askbot {
           }
         }
 
-        .tabula-rasa {
+        p.tabula-rasa {
           @include border-radius(5px);
           background-color: #f6f6f6;
           color: #888;
           margin: 10px auto;
           padding: 20px;
           text-align: center;
-          width: grid-width(5);
+          width: flex-grid(5);
 
           &:first-child {
             margin-top: 70px;
           }
+          &:last-child {
+            margin-bottom: 70px;
+          }
 
           a {
             text-decoration: none;
@@ -123,7 +130,7 @@ body.askbot {
         border-left: 1px solid #d3d3d3;
         border-right: 1px solid #f6f6f6;
         padding: $gw-gutter;
-        width: grid-width(3);
+        width: flex-grid(3);
 
         h2 {
           font-size: 16px;
@@ -135,7 +142,7 @@ body.askbot {
         }
 
         input[type="text"] {
-          width: 68%;
+          width: 76%;
         }
 
         #displayTagFilterControl {
@@ -149,7 +156,7 @@ body.askbot {
     margin: 0 auto;
     padding: 0;
 
-    .footer-wrapper {
+    div.footer-wrapper {
       @extend .clearfix;
       @extend .wrapper;
       @include box-shadow(0 1px 0 #fff);
diff --git a/sass/application.scss b/sass/application.scss
index cd7267791b..f274acbfb8 100644
--- a/sass/application.scss
+++ b/sass/application.scss
@@ -14,7 +14,7 @@
 @import "wiki-create", "wiki";
 @import "activation";
 @import "help";
-@import "discussion", "askbot-original";
+@import "discussion", "discussion-questions", "askbot-original";
 
 // left over
 @import "theme";