diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss
index a12f7bb6f5..6fb2f026d6 100644
--- a/sass/_askbot-original.scss
+++ b/sass/_askbot-original.scss
@@ -662,116 +662,116 @@ ul#searchTags {
   float: right;
   padding-top: 2px; }
 
-.search-tips {
-  font-size: 16px;
-  line-height: 17px;
-  color: #707070;
-  margin: 5px 0 10px 0;
-  padding: 0px;
-  float: left;
-  font-family: 'Yanone Kaffeesatz',sans-serif;
-  a {
-    text-decoration: underline;
-    color: #1b79bd; } }
+// .search-tips {
+//   font-size: 16px;
+//   line-height: 17px;
+//   color: #707070;
+//   margin: 5px 0 10px 0;
+//   padding: 0px;
+//   float: left;
+//   font-family: 'Yanone Kaffeesatz',sans-serif;
+//   a {
+//     text-decoration: underline;
+//     color: #1b79bd; } }
 
-#question-list {
-  float: left;
-  position: relative;
-  background-color: #FFF;
-  padding: 0;
-  width: 100%; }
+// #question-list {
+//   float: left;
+//   position: relative;
+//   background-color: #FFF;
+//   padding: 0;
+//   width: 100%; }
 
-.short-summary {
-  position: relative;
-  filter: inherit;
-  padding: 10px;
-  border-bottom: 1px solid #DDDBCE;
-  margin-bottom: 1px;
-  overflow: hidden;
-  width: 710px;
-  float: left;
-  background: url(../images/summary-background.png) repeat-x;
-  h2 {
-    font-size: 24px;
-    font-weight: normal;
-    line-height: 26px;
-    padding-left: 0;
-    margin-bottom: 6px;
-    display: block;
-    font-family: 'Yanone Kaffeesatz',sans-serif; }
-  a {
-    color: #464646; }
-  .userinfo {
-    text-align: right;
-    line-height: 16px;
-    font-family: Arial;
-    padding-right: 4px;
-    .relativetime {
-      font-size: 11px;
-      clear: both;
-      font-weight: normal;
-      color: #555; } }
-  span.anonymous {
-    font-size: 11px;
-    clear: both;
-    font-weight: normal;
-    color: #555; }
-  .userinfo a {
-    font-weight: bold;
-    font-size: 11px; }
-  .counts {
-    float: right;
-    margin: 4px 0 0 5px;
-    font-family: 'Yanone Kaffeesatz',sans-serif;
-    .item-count {
-      padding: 0px 5px 0px 5px;
-      font-size: 25px;
-      font-family: 'Yanone Kaffeesatz',sans-serif; }
-    .votes div, .views div, .answers div, .favorites div {
-      margin-top: 3px;
-      font-size: 14px;
-      line-height: 14px;
-      color: #646464; } }
-  .tags {
-    margin-top: 0; }
-  .votes, .answers, .favorites, .views {
-    text-align: center;
-    margin: 0 3px;
-    padding: 8px 2px 0px 2px;
-    width: 51px;
-    float: right;
-    height: 44px;
-    border: #dbdbd4 1px solid; }
-  .votes {
-    background: url(../images/vote-background.png) repeat-x; }
-  .answers {
-    background: url(../images/answers-background.png) repeat-x; }
-  .views {
-    background: url(../images/view-background.png) repeat-x; }
-  .no-votes .item-count {
-    color: #b1b5b6; }
-  .some-votes .item-count {
-    color: #4a757f; }
-  .no-answers .item-count {
-    color: #b1b5b6; }
-  .some-answers .item-count {
-    color: #eab243; }
-  .no-views .item-count {
-    color: #b1b5b6; }
-  .some-views .item-count {
-    color: #d33f00; }
-  .accepted .item-count {
-    background: url(../images/accept.png) no-repeat top right;
-    display: block;
-    text-align: center;
-    width: 40px;
-    color: #eab243; }
-  .some-favorites .item-count {
-    background: #338333;
-    color: #d0f5a9; }
-  .no-favorites .item-count {
-    background: #eab243;
-    color: yellow; } }
+// .short-summary {
+//   position: relative;
+//   filter: inherit;
+//   padding: 10px;
+//   border-bottom: 1px solid #DDDBCE;
+//   margin-bottom: 1px;
+//   overflow: hidden;
+//   width: 710px;
+//   float: left;
+//   background: url(../images/summary-background.png) repeat-x;
+//   h2 {
+//     font-size: 24px;
+//     font-weight: normal;
+//     line-height: 26px;
+//     padding-left: 0;
+//     margin-bottom: 6px;
+//     display: block;
+//     font-family: 'Yanone Kaffeesatz',sans-serif; }
+//   a {
+//     color: #464646; }
+//   .userinfo {
+//     text-align: right;
+//     line-height: 16px;
+//     font-family: Arial;
+//     padding-right: 4px;
+//     .relativetime {
+//       font-size: 11px;
+//       clear: both;
+//       font-weight: normal;
+//       color: #555; } }
+//   span.anonymous {
+//     font-size: 11px;
+//     clear: both;
+//     font-weight: normal;
+//     color: #555; }
+//   .userinfo a {
+//     font-weight: bold;
+//     font-size: 11px; }
+//   .counts {
+//     float: right;
+//     margin: 4px 0 0 5px;
+//     font-family: 'Yanone Kaffeesatz',sans-serif;
+//     .item-count {
+//       padding: 0px 5px 0px 5px;
+//       font-size: 25px;
+//       font-family: 'Yanone Kaffeesatz',sans-serif; }
+//     .votes div, .views div, .answers div, .favorites div {
+//       margin-top: 3px;
+//       font-size: 14px;
+//       line-height: 14px;
+//       color: #646464; } }
+//   .tags {
+//     margin-top: 0; }
+//   .votes, .answers, .favorites, .views {
+//     text-align: center;
+//     margin: 0 3px;
+//     padding: 8px 2px 0px 2px;
+//     width: 51px;
+//     float: right;
+//     height: 44px;
+//     border: #dbdbd4 1px solid; }
+//   .votes {
+//     background: url(../images/vote-background.png) repeat-x; }
+//   .answers {
+//     background: url(../images/answers-background.png) repeat-x; }
+//   .views {
+//     background: url(../images/view-background.png) repeat-x; }
+//   .no-votes .item-count {
+//     color: #b1b5b6; }
+//   .some-votes .item-count {
+//     color: #4a757f; }
+//   .no-answers .item-count {
+//     color: #b1b5b6; }
+//   .some-answers .item-count {
+//     color: #eab243; }
+//   .no-views .item-count {
+//     color: #b1b5b6; }
+//   .some-views .item-count {
+//     color: #d33f00; }
+//   .accepted .item-count {
+//     background: url(../images/accept.png) no-repeat top right;
+//     display: block;
+//     text-align: center;
+//     width: 40px;
+//     color: #eab243; }
+//   .some-favorites .item-count {
+//     background: #338333;
+//     color: #d0f5a9; }
+//   .no-favorites .item-count {
+//     background: #eab243;
+//     color: yellow; } }
 
 // .evenMore {
 //   font-size: 13px;
@@ -869,31 +869,31 @@ ul#searchTags {
 .tag-size-10 {
   font-size: 21px; }
 
-ul {
-  &.tags {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    line-height: 170%;
-    display: block;
-    &.marked-tags {
-      list-style: none;
-      margin: 0;
-      padding: 0;
-      line-height: 170%;
-      display: block; } }
-  &#related-tags {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    line-height: 170%;
-    display: block; }
-  &.tags li {
-    float: left;
-    display: block;
-    margin: 0 8px 0 0;
-    padding: 0;
-    height: 20px; } }
+// ul {
+//   &.tags {
+//     list-style: none;
+//     margin: 0;
+//     padding: 0;
+//     line-height: 170%;
+//     display: block;
+//     &.marked-tags {
+//       list-style: none;
+//       margin: 0;
+//       padding: 0;
+//       line-height: 170%;
+//       display: block; } }
+//   &#related-tags {
+//     list-style: none;
+//     margin: 0;
+//     padding: 0;
+//     line-height: 170%;
+//     display: block; }
+//   &.tags li {
+//     float: left;
+//     display: block;
+//     margin: 0 8px 0 0;
+//     padding: 0;
+//     height: 20px; } }
 
 .wildcard-tags {
   clear: both; }
@@ -919,35 +919,35 @@ ul {
     float: left;
     clear: left; } }
 
-.tag-left {
-  cursor: pointer;
-  display: block;
-  float: left;
-  height: 17px;
-  margin: 0 5px 0 0;
-  padding: 0;
-  -webkit-box-shadow: 0px 0px 5px #d3d6d7;
-  -moz-box-shadow: 0px 0px 5px #d3d6d7;
-  box-shadow: 0px 0px 5px #d3d6d7; }
+// .tag-left {
+//   cursor: pointer;
+//   display: block;
+//   float: left;
+//   height: 17px;
+//   margin: 0 5px 0 0;
+//   padding: 0;
+//   -webkit-box-shadow: 0px 0px 5px #d3d6d7;
+//   -moz-box-shadow: 0px 0px 5px #d3d6d7;
+//   box-shadow: 0px 0px 5px #d3d6d7; }
 
-.tag-right {
-  background: #f3f6f6;
-  border: #fff 1px solid;
-  border-top: #fff 2px solid;
-  outline: #cfdbdb 1px solid;
-  display: block;
-  float: left;
-  height: 17px;
-  line-height: 17px;
-  font-weight: normal;
-  font-size: 11px;
-  padding: 0px 8px 0px 8px;
-  text-decoration: none;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  font-family: Arial;
-  color: #717179; }
+// .tag-right {
+//   background: #f3f6f6;
+//   border: #fff 1px solid;
+//   border-top: #fff 2px solid;
+//   outline: #cfdbdb 1px solid;
+//   display: block;
+//   float: left;
+//   height: 17px;
+//   line-height: 17px;
+//   font-weight: normal;
+//   font-size: 11px;
+//   padding: 0px 8px 0px 8px;
+//   text-decoration: none;
+//   text-align: center;
+//   white-space: nowrap;
+//   vertical-align: middle;
+//   font-family: Arial;
+//   color: #717179; }
 
 .deletable-tag {
   margin-right: 3px;
@@ -2563,13 +2563,13 @@ p.signup_p {
     margin-bottom: 7px;
     font-size: 14px; } }
 
-.search-result-summary {
-  font-weight: bold;
-  font-size: 18px;
-  line-height: 22px;
-  margin: 0px 0px 0px 0px;
-  padding: 2px 0 0 0;
-  float: left; }
+// .search-result-summary {
+//   font-weight: bold;
+//   font-size: 18px;
+//   line-height: 22px;
+//   margin: 0px 0px 0px 0px;
+//   padding: 2px 0 0 0;
+//   float: left; }
 
 .faq-rep-item {
   text-align: right;
diff --git a/sass/_discussion-questions.scss b/sass/_discussion-questions.scss
index e69de29bb2..73b39f738f 100644
--- a/sass/_discussion-questions.scss
+++ b/sass/_discussion-questions.scss
@@ -0,0 +1,160 @@
+div.question-controls {
+  display: block;
+  margin-bottom: 30px;
+  overflow: hidden;
+  width: flex-grid(9,9);
+
+  div {
+    display: inline-block;
+  }
+
+  div.question-count {
+    margin-right: flex-gutter();
+    width: flex-grid(5.5,9);
+
+    h1 {
+      margin-top: 0;
+    }
+  }
+
+  div.question-sort {
+    vertical-align: bottom;
+    width: flex-grid(3.5,9);
+
+    nav {
+      @include border-radius(35px);
+      background-color: lighten(#F6EFD4, 5%) ;
+      height: 30px;
+      float: right;
+      font-size: 16px;
+      margin: 3px 0;
+      padding: 0 20px;
+
+      a {
+        color: darken(#F6EFD4, 50%);
+
+        &:before {
+          content: '|';
+          color: darken(#F6EFD4, 10%);
+          font-size: 22px;
+        }
+
+        &:hover {
+          text-decoration: none;
+          color: darken(#F6EFD4, 70%);
+        }
+      }
+    }
+  }
+}
+
+ul.question-list {
+  width: flex-grid(9,9);
+
+  li.single-question {
+    border-top: 1px solid #eee;
+    list-style: none;
+    padding: 10px 0;
+
+    &:hover {
+      background: lighten(#F6EFD4, 8%);
+    }
+
+    div {
+      display: inline-block;
+
+      &.question-body {
+        @include box-sizing(border-box);
+        margin-right: flex-gutter();
+        padding-left: 10px;
+        width: flex-grid(5.5,9);
+
+        h2 {
+          font-size: 16px;
+          font-weight: normal;
+          margin: 0px 0 15px 0;
+          text-transform: none;
+
+          a {
+            color: #000;
+          }
+        }
+
+        div.user-info {
+          display: inline-block;
+          vertical-align: top;
+
+          span.relative-time {
+            font-weight: normal;
+          }
+
+          a {
+            color: $mit-red;
+          }
+        }
+
+        ul.tags {
+          display: inline-block;
+        }
+
+      }
+
+      &.question-meta {
+        width: flex-grid(3.5,9);
+
+        ul {
+          text-align: right;
+
+          li {
+            @include border-radius(3px);
+            display: inline-block;
+            height:60px;
+            margin-right: 10px;
+            width: 60px;
+
+            &.views {
+              background: lighten(#F6EFD4, 5%);
+            }
+
+            &.answers {
+              background: #F6EFD4;
+            }
+
+            &.votes {
+              background: darken(#F6EFD4, 5%);
+            }
+
+            span, div {
+              @include box-sizing(border-box);
+              color: darken(#F6EFD4, 60%);
+              display: block;
+              text-align: center;
+            }
+
+            span {
+              font-size: 16px;
+              font-weight: bold;
+              height: 35px;
+              padding-top: 15px;
+              vertical-align: middle;
+            }
+
+            div {
+              height: 25px;
+              font-size: 12px;
+            }
+          }
+        }
+      }
+    }
+
+  }
+}
+
+div.search-tips {
+  display: block;
+}
+
+.search-result-summary {
+}
+
diff --git a/sass/_discussion-tags.scss b/sass/_discussion-tags.scss
new file mode 100644
index 0000000000..af4fc11f4a
--- /dev/null
+++ b/sass/_discussion-tags.scss
@@ -0,0 +1,27 @@
+ul.tags {
+  list-style: none;
+  li, a {
+    position: relative;
+  }
+  li {
+    @include border-radius(4px);
+    background: #eee;
+    color: #555;
+    display: inline;
+    font-size: 12px;
+    margin-left: 15px;
+    padding: 5px 10px 5px 5px;
+
+    &:before {
+     content:"";
+     position:absolute;
+     top:0;
+     left:-12px;
+     width:0;
+     height:0;
+     border-color:transparent #eee transparent transparent;
+     border-style:solid;
+     border-width:12px 12px 12px 0;
+    }
+  }
+}
diff --git a/sass/_discussion.scss b/sass/_discussion.scss
index c19bf06fd4..4a240bdebe 100644
--- a/sass/_discussion.scss
+++ b/sass/_discussion.scss
@@ -75,31 +75,6 @@ body.askbot {
         vertical-align: top;
         width: flex-grid(9);
 
-        div.order-sort {
-          @include border-radius(35px);
-          background-color: lighten(#F6EFD4, 5%) ;
-          height: 30px;
-          float: right;
-          font-size: 16px;
-          margin: 3px 0;
-          padding: 0 20px;
-
-          a {
-            color: darken(#F6EFD4, 50%);
-
-            &:before {
-              content: '|';
-              color: darken(#F6EFD4, 10%);
-              font-size: 22px;
-            }
-
-            &:hover {
-              text-decoration: none;
-              color: darken(#F6EFD4, 70%);
-            }
-          }
-        }
-
         p.tabula-rasa {
           @include border-radius(5px);
           background-color: #f6f6f6;
diff --git a/sass/_textbook.scss b/sass/_textbook.scss
index b0fbdcd372..8456e7fc1b 100644
--- a/sass/_textbook.scss
+++ b/sass/_textbook.scss
@@ -4,13 +4,38 @@ div.book-wrapper {
   ul#booknav {
     @extend .sidebar;
     @include box-sizing(border-box);
-    padding: lh();
+
+    a {
+      color: #000;
+
+      &:hover {
+        color: #666;
+      }
+    }
 
     li {
+      background: none;
+      padding-left: 30px;
+
+      div.hitarea {
+        margin-left: -22px;
+
+        &:hover {
+          opacity: 0.6;
+          filter: alpha(opacity=60);
+        }
+      }
+
       ul {
         background: none;
       }
     }
+
+    > li {
+      border-bottom: 1px solid #d3d3d3;
+      @include box-shadow(0 1px 0 #eee);
+      padding: 7px 7px 7px 30px;
+    }
   }
 
   section.book {
diff --git a/sass/application.scss b/sass/application.scss
index a61c801f82..cf57b00093 100644
--- a/sass/application.scss
+++ b/sass/application.scss
@@ -14,7 +14,7 @@
 @import "wiki-basic-html", "wiki-create", "wiki";
 @import "activation";
 @import "help";
-@import "discussion", "discussion-questions", "askbot-original";
+@import "askbot-original", "discussion", "discussion-questions", "discussion-tags" ;
 
 // left over
 @import "theme";