diff --git a/lms/static/images/vote-arrows.png b/lms/static/images/vote-arrows.png
new file mode 100644
index 0000000000..6f84cdb271
Binary files /dev/null and b/lms/static/images/vote-arrows.png differ
diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 9c04201e0c..c6e51c4617 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -1,10 +1,17 @@
 $comment_margin_left: 30px;
 $discussion_title_size: 1.6em;
 $comment_title_size: 1.0em;
-$comment_body_size: 0.9em;
+$post_font_size: 0.9em;
 $comment_info_size: 0.75em;
+$comment_font_size: 0.8em;
 $discussion_input_width: 100%;
 
+$tag_background_color: #e7ecdd;
+$tag_border_color: #babdb3;
+$tag_text_color: #5b614f;
+
+
+
 @mixin discussion-font {
   font-family: inherit;
 }
@@ -16,67 +23,96 @@ $discussion_input_width: 100%;
   }
 }
 
-form label {
-  @include discussion-font;
-  font-size: 14px;
-  font-style: normal;
-  font-weight: normal;
-  text-shadow: none;
-}
-
-div.recent-activity {
-  margin: 20% 4%;
-  
-  div.recent-activity-title {
-    font-weight: bold;
-  }
-  
-  a.recent-active-post {
-    display: block;
-    font-size: $comment_body_size;
-    line-height: 120%;
-    margin-top: 8px;
-
-    &:hover {
-      color: #1C71DD;
-      text-decoration: none;
-      font-weight: normal;
-    }
-  }
-}
-
-div.trending-tags {
-  font-weight: bold;
-  margin: 15% 0 0 0;
-  
-  .trending-tag {
-    margin-top: 5px;
-  }
-  
-  .trending-tag-link {
-    @include discussion-font;
-    background: #CDE69C;
-    border: 1px solid #A5D24A;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    color: #638421;
-    display: block;
-    float: left;
-    font-size: 13px;
-    margin-right: 4px;
-    padding: 5px 7px;
+@mixin standard-discussion-link {
+  text-decoration: none;
+  &:hover {
+    color: #1C71DD;
     text-decoration: none;
-        
-    &:hover {
-      border-color: #1E4612;
-      color: #1E4612;
-      text-decoration: none;
-    }
   }
 }
 
 .discussion {
-  
+
+  #open_close_accordion {
+    display: none;
+  }
+
+  .sidebar-module {    
+    @include clearfix;
+    padding: 0 24px 24px 0;
+    margin-bottom: 24px;    
+    border-bottom: 1px solid #d3d3d3;
+    font-size: 0.8em;
+
+    header {
+      margin-bottom: 14px;
+      @include clearfix;
+    }
+
+    h4 {
+      float: left;
+      font-size: 1.1em;
+      font-weight: bold;
+    }
+
+    .sidebar-new-post-button {
+      @include button;
+      display: block;
+      box-sizing: border-box;
+      width: 100%;
+      margin: 20px 0;
+      padding: 11px;
+      font-size: 1.1em;
+      text-align: center;
+
+      &:hover {
+        text-decoration: none;
+      }
+    }
+
+    .sidebar-view-all {
+      float: right;
+      font-size: 0.9em;
+      line-height: 1.6em;
+      @include standard-discussion-link;
+    }
+
+    .discussion-sidebar-following-list {
+      li {
+        @include clearfix;
+        margin-bottom: 8px;
+      }
+
+      a {        
+        @include standard-discussion-link;
+      }
+    }
+
+    .discussion-sidebar-tags-list li {
+      @include clearfix;
+    }
+
+    .sidebar-tag-count {
+      color: #9a9a9a;
+      font-size: .85em;
+      line-height: 3em;
+    }
+
+    .sidebar-following-name {
+      float: left;
+      width: 80%;
+    }
+
+    .sidebar-vote-count {
+      float: right;
+      width: 20%;
+      text-align: right;
+      color: #9a9a9a;
+    }
+
+
+  }
+
   .discussion-non-content {
     margin-left: flex-gutter();
   }
@@ -91,7 +127,7 @@ div.trending-tags {
     font-weight: bold;
     margin-bottom: flex-gutter(6);
   }
-  
+
   .discussion-title-wrapper {
     .discussion-watch-discussion, .discussion-unwatch-discussion {
       @include discussion-font;
@@ -100,32 +136,43 @@ div.trending-tags {
       margin-left: 5px;
     }
   }
-  
+
   .blank {
     margin: 2%;
   }
-  
+
   //SORTING
   
   .discussion-sort {
     float: right;
-    font-size: $comment_body_size;
-    margin-top: -2.5%;
-    
+    font-size: 0.8em;
+    margin-top: -36px;
+
+    .discussion-label {
+      display: block;
+      float: left;
+      padding: 0 14px;
+      line-height: 34px;
+    }
+
     .discussion-sort-link {
-      
+      display: block;
+      float: left;
+      padding: 0 14px;
+      line-height: 34px;
+
       &:hover {
         color: #1C71DD;
         text-decoration: none;
       }
     }
-    
+
     .discussion-sort-link.sorted {
-      color: #1C71DD; 
-      font-weight: bold;
+      color: #000;
+      border-bottom: 2px solid #000;
     }
   }
-  
+
   //SEARCH
   
   .search-wrapper-inline {
@@ -134,14 +181,18 @@ div.trending-tags {
     margin-top: 3%;
     width: 80%;
   }
-  
+
+  .search-wrapper {
+    height: 110px;
+  }
+
   .discussion-search-form {
     display: inline-block;
     margin-bottom: 1%;
     width: flex-grid(12);
-    
+
     .discussion-link {
-      @include button;
+      @include button(simple, #999);
       color: white;
       display: inline-block;
       font-size: inherit;
@@ -150,30 +201,32 @@ div.trending-tags {
       padding-top: 9px;
       text-decoration: none;
     }
-    
+
     .discussion-search-text {
       @include discussion-font;
     }
-    
+
     .search-input {
       float: left;
       font: inherit;
       font-style: normal;
-      width: 72%;
+      // width: 72%;
+      width: flex-grid(8);
+      margin-left: flex-grid(1);
     }
   }
-  
+
   .search-within {
     display: block;
     margin-bottom: 3%;
   }
-  
+
   .discussion-search-within-board {
     font: inherit;
-    font-size: $comment_body_size;
+    font-size: $post_font_size;
     font-style: normal;
   }
-  
+
   //BASIC BUTTON STYLES
   
   .control-button {
@@ -199,7 +252,7 @@ div.trending-tags {
     width: inherit;
     text-decoration: none;
     text-shadow: none;
-    
+
     &:hover {
       background-color: #A2A2A2;
       background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #A2A2A2),color-stop(100%, #7B7B7B));
@@ -214,83 +267,86 @@ div.trending-tags {
       box-shadow: inset 0 1px 0 #BBB,0 0 3px #CCC;
     }
   }
-  
+
   //FOLLOW BUTTON
   
   .follow-wrapper {
-    float: right;
-    
-    .discussion-link {
-      @include button;
-      background-color: #BEBEBE;
-      background-image: none;
-      border: none;
-      -webkit-box-shadow: none;
-      -moz-box-shadow: none;
-      box-shadow: none;
-      display: inline-block;
-      font-size: $comment_info_size;
-      padding: 5px 8px;
-      text-decoration: none;
-      text-shadow: none;
-      
-      &:hover {
-        background-color: #AAA;
-        background-image: none;
-        border: none;
-        -webkit-box-shadow: none;
-        -moz-box-shadow: none;
-        box-shadow: none;
-      }
-    }
+    display: inline;
   }
 
   //VOTES
   
   .discussion-votes {
     float: left;
-    height: flex-grid(3);
-    margin: 1% 2%;
+    width: 60px;
+    margin-top: 18px;
     text-align: center;
-    
-    .discussion-vote-count {
-      @include discussion-font;
-      font-size: $comment_body_size;
-    }
-    
-    a.discussion-vote {
-      color: black;
-      display: block;
+
+    .discussion-vote {      
+      display: block;      
+      width: 50px;
+      height: 17px;
+      margin: auto;
+      background: url(../images/vote-arrows.png) no-repeat;
       font-size: 15px;
       font-weight: bold;
-      
+      color: black;
+      @include hide-text;
+      @include transition(all, 0, easeOut);
+    }
+
+    .discussion-vote-up {
+      margin-bottom: 5px;
+      background-position: -50px -3px;      
+
       &:hover {
-        color: #1C71DD;
-        text-decoration: none;
+        background-position: -50px -5px;
+        @include transition-duration(0.05s);
       }
-      
-      &.discussion-vote-up {
-        margin-bottom: 3px;
-      }
-      
-      &.discussion-vote-down {
-        margin-top: 5px;
-      }
-      
+
       &.voted {
+        background-position: 0 -3px;
         color: #1C71DD;
+        @include transition-duration(0);
       }
     }
+
+    .discussion-vote-down {
+      margin-top: 7px;
+      background-position: -50px -30px;
+
+      &:hover {
+        background-position: -50px -28px;
+        @include transition-duration(0.05s);
+      }
+
+      &.voted {
+        background-position: 0 -30px;
+        color: #1C71DD;
+        @include transition-duration(0);
+      }
+    }   
+
+    .discussion-vote-count {
+      @include discussion-font;
+      font-size: $post_font_size;
+    }
+
+    .discussion-votes-point {
+      font-size: 1.1em;
+      font-weight: bold;
+      color: #9a9a9a;
+    }
   }
 
   //CREATE NEW AND EDIT POSTS
   
   .discussion-right-wrapper {
-    float: left;
     min-height: 40px;
-    width: 90%;
+    // width: flex-grid(11);
+    margin: 24px 0 24px 68px;
   }
-  
+
   .new-post-form, .discussion-thread-edit {
     
     .title-input, .body-input {
@@ -299,32 +355,17 @@ div.trending-tags {
       font-style: normal;
       width: $discussion_input_width !important;
     }
-    
-    .new-post-similar-posts-wrapper {
-      @include border-radius(3px);
-      border: 1px solid #EEE;
-      font-size: $comment_body_size;
-      line-height: 150%;
-      margin-top: 1%;
-      padding: 1% 1.5%;
+
+    .discussion-errors {
+      color: #8F0E0E;
+      display: block;
+      margin-left: -5%;
     }
-    
-    .hide-similar-posts {
-      float: right;
-    }
-    
-    .new-post-similar-posts {
-      font: inherit;
-      .similar-post {
-        display: block;
-        line-height: 150%;
-      }
-    }
-    
+
     .new-post-body {
       margin-top: flex-gutter();
     }
-    
+
     .tagsinput {
       background: #FAFAFA;
       border: 1px solid #C8C8C8;
@@ -352,7 +393,7 @@ div.trending-tags {
       color: #8F0E0E;
       display: block;
       font: inherit;
-      font-size: $comment_body_size;
+      font-size: $post_font_size;
       list-style: none;
       margin-left: -3%;
       padding-left: 2em;
@@ -362,30 +403,55 @@ div.trending-tags {
       color: #1C71DD;
       text-decoration: none;
     };
-    
+
+    &.collapsed {
+      .wmd-button-row {
+        height: 0;
+      }
+
+      .wmd-input {
+        height: 100px;
+        @include border-radius(3px);
+      }
+
+      .wmd-preview {
+        height: 0;
+        padding: 0;
+        border-width: 0;
+      }
+
+      .post-options {
+        height: 0;
+      }
+
+      .reply-post-control {
+        height: 0;
+      }
+    }
+
     .new-post-control {
       margin-left: 80%;
       margin-top: 1%;
     }
-    
+
     .reply-post-control {
-      margin-left: 73%;
+      // margin-left: 73%;
     }
-    
+
     .edit-post-control {
       margin-left: 79%;
       margin-top: 1%;
     }
-    
+
     .control-button {
       @include button;
       @include discussion-font;
+      margin-right: 16px;
+      padding-top: 9px;
       color: white;
       display: inline-block;
       font-size: inherit;
       font-weight: bold;
-      margin-left: 5%;
-      padding-top: 9px;
       text-decoration: none;
       width: inherit;
       
@@ -393,12 +459,19 @@ div.trending-tags {
         color: white;
       }
     }
+
+    label {
+      font-family: $sans-serif;
+      font-size: .8em;
+      font-style: normal;
+      font-weight: 400;
+    }
   }
 
   .new-post-form {
     margin: 10px 0 40px 0;
   }
-  
+
   .discussion-reply-new {
     
     .discussion-auto-watch {
@@ -406,6 +479,25 @@ div.trending-tags {
     }
   }
 
+  .thread-tag {
+    background: $tag_background_color;
+    border: 1px solid $tag_border_color;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    color: $tag_text_color;
+    float: left;
+    font-size: 13px;
+    margin: 5px 7px 5px 0;
+    padding: 5px 7px;
+    text-decoration: none;
+
+    &:hover {
+      border-color: #7b8761;
+      color: #2f381c;
+      text-decoration: none;
+    }
+  }
+
   //THREAD STYLES
   
   .thread {
@@ -416,49 +508,30 @@ div.trending-tags {
       font-weight: bold;
       background-color: lightyellow;
     }
-    
+
     .thread-title {
       @include discussion-font;
       @include discussion-clickable;
       display: block;
+      margin-bottom: $body-line-height;
       font-size: $comment_title_size;
       font-weight: bold;
+      line-height: 1.4em;
     }
-    
+
     .thread-body, .content-body {
       @include discussion-font;
-      font-size: $comment_body_size;
+      font-size: $post_font_size;
       margin-bottom: 4px;
       margin-top: 3px;
-      min-height: 35px;
-      
+
       p {
         @include discussion-font;
-        margin: 0;
       }
     }
 
     .thread-tags {
       display: inline-block;
-
-      .thread-tag {
-        @include discussion-font;
-        background: #CDE69C;
-        border: 1px solid #A5D24A;
-        -moz-border-radius: 2px;
-        -webkit-border-radius: 2px;
-        color: #638421;
-        float: left;
-        font-size: 13px;
-        margin: 5px 7px 5px 0;
-        padding: 5px 7px;
-        text-decoration: none;
-        
-        &:hover {
-          border-color: #1E4612;
-          color: #1E4612;
-        }
-      }
     }
 
     .info {
@@ -467,101 +540,113 @@ div.trending-tags {
       font-size: $comment_info_size;
       font-style: italic;
       margin-top: 2%;
-      
-      a {
-        
-        &:hover {
+
+      a:hover {
         text-decoration: none;
         color: #1C71DD;
-        }
       }
 
       .comment-time {
         display: inline;
         float: right;
-        margin-right: -4%;
       }
-      
+
       .comment-count {
         display: inline;
+        margin-right: 20px;
       }
-      
-      .discussion-reply {
-        margin-left: 4px;
+
+      .discussion-actions {        
+        display: inline;
+        margin: 0;
+        padding: 0;
+
+        li {
+          display: inline;
+          margin-right: 20px;
+        }
       }
-      
+
       .discussion-link {
         @include discussion-font;
         color: #1d9dd9;
         display: inline;
-        margin-left: 2px;
-        
-        &:hover {
-          text-decoration: none;
-          color: #1C71DD;
+
+        &.discussion-unfollow-thread {
+          color: #dea03e;
         }
       }
     }
-    
+
     .discussion-content {
       border-top: lightgray 1px solid;
       overflow: hidden;
-      padding: 1.5% 0;
-    
+      // padding: 1.5% 0;
+
       .discussion-reply-new {
         @include discussion-font;
-        margin-left: 5%;
-      
+        margin-left: 68px;
+
         .reply-body {
           @include discussion-font;
           display: block;
-          font-size: $comment_body_size;
+          font-size: $post_font_size;
           margin-top: 10px;
           width: 95%;
         }
       }
     }
-    
+
     //COMMENT STYLES
     
     .comments {
       //display: none;
-      margin-left: $comment_margin_left;
+      // margin-left: $comment_margin_left;
+      // margin-left: flex-grid(1);
+      margin-left: 68px;
       overflow: hidden;
-    
+
+      .discussion-votes {
+        margin-top: 8px;
+      }
+
+      .discussion-right-wrapper {
+        margin: 10px 0 10px 68px;
+      }
+
       .comment {
       
         .comment-body, .content-body {
           @include discussion-font;
           color: black;
           display: block;
-          font-size: $comment_body_size;
+          font-size: $comment_font_size;
           margin-top: 3px;
         }
-        
+
         &.endorsed {
         
           > .discussion-content {
-            background-color: lightyellow;
+            background-color: #fcfcea;
           }
         }
       }
     }
   }
-  
+
   //PAGES
   
   .discussion-paginator {
-    font-size: $comment_body_size;
+    font-size: $post_font_size;
     margin-bottom: 10px;
     margin-top: 20px;
     text-align: center;
-  
+
     div {
       display: inline-block;
       font-weight: bold;
       margin: 0 5px;
-    
+
       a {
         background: #EEE;
         -webkit-border-radius: 3px;
@@ -573,13 +658,28 @@ div.trending-tags {
         font-weight: normal;
         padding: 4px 10px;
         text-decoration: none;
-      
+
         &:hover {
           background: #DDD;
         }
       }
     }
   }
+
+  &.inline-discussion {
+    .new-post-form {
+      margin: 24px 60px;
+
+      .post-options {
+        margin: 8px 0 16px 0;
+        overflow: hidden;
+      }
+
+      .reply-post-control {
+        overflow: hidden;
+      }
+    }
+  }
 }
 
 //EDITOR STYLES
@@ -596,22 +696,50 @@ div.trending-tags {
   background-color: Silver; 
 }
 
-.wmd-input 
-{ 
+.wmd-input {
   height: 150px;
   width: 100%;
-  background-color: Gainsboro;
-  border: 1px solid DarkGray;
-  font: inherit;
+  background-color: #e9e9e9;
+  border: 1px solid #c8c8c8;
+  font-family: Monaco, 'Lucida Console', monospace;
+  font-style: normal;
+  font-size: 0.8em;
+  line-height: 1.6em;
+  @include border-radius(3px 3px 0 0);
+
+  &::-webkit-input-placeholder {
+    color: #888;
+  }
 }
 
-.wmd-preview 
-{ 
-  background-color: #c0e0ff;
+.wmd-preview {
+  position: relative;
+  font-family: $sans-serif;
+  padding: 25px 20px 10px 20px;
+  margin-bottom: 5px;
+  box-sizing: border-box;
+  border: 1px solid #c8c8c8;
+  border-top-width: 0;
+  @include border-radius(0 0 3px 3px);
+  overflow: hidden;
+  @include transition(all, .2s, easeOut);
+
+  &:before {
+    content: 'PREVIEW';
+    position: absolute;
+    top: 3px;
+    left: 5px;
+    font-size: 11px;
+    color: #bbb;
+  }
+
+  p {
+    font-family: $sans-serif;
+  }
+  background-color: #fafafa;
 }
 
-.wmd-button-row 
-{
+.wmd-button-row {
   position: relative; 
   margin-left: 5px;
   margin-right: 5px;
@@ -619,6 +747,8 @@ div.trending-tags {
   margin-top: 10px;
   padding: 0px;  
   height: 20px;
+  overflow: hidden;
+  @include transition(all, .2s, easeOut);
 }
 
 .wmd-spacer
diff --git a/lms/templates/discussion/_accordion.html b/lms/templates/discussion/_accordion.html
index c072705d55..c5db48e43b 100644
--- a/lms/templates/discussion/_accordion.html
+++ b/lms/templates/discussion/_accordion.html
@@ -1,23 +1,29 @@
 <%! from django.core.urlresolvers import reverse %>
 
-<%
-def url_for(commentable):
-  return reverse('django_comment_client.forum.views.forum_form_discussion', args=[course.id, commentable['discussion_id']])
-%>
+<article class="sidebar-module">
+  <a href="#" class="sidebar-new-post-button">New Post</a>
+</article>
 
-<%def name="make_category(category, commentables)">
-  <h3><a href="#">${category}</a></h3>
+<article class="discussion-sidebar-following sidebar-module">
+  <header>
+    <h4>Following</h4>
+    <a href="#" class="sidebar-view-all">view all &rsaquo;</a>
+  </header>
+  <ol class="discussion-sidebar-following-list">
+    <li><a href="#"><span class="sidebar-following-name">Hints on HW4</span> <span class="sidebar-vote-count">1348</span></a></li>
+    <li><a href="#"><span class="sidebar-following-name">Answers to Mi-term</span> <span class="sidebar-vote-count">-37</span></a></li>
+    <li><a href="#"><span class="sidebar-following-name">Summaries for Lectures 1 to 12 (more added, links fixed)</span> <span class="sidebar-vote-count">128</span></a></li>
+  <ol>
+</article>
 
-    <ul>
-      % for commentable in commentables: 
-        <li${' class="active"' if active == commentable['discussion_id'] else ''}>
-          <a href="${url_for(commentable)}">
-            <p>${commentable['title']}</p>
-          </a>
-        % endfor
-      </ul>
-    </%def>
-
-% for category, commentables in discussion_info.items(): 
-    ${make_category(category, commentables)}
-% endfor
+<article class="discussion-sidebar-tags sidebar-module">
+  <header>
+    <h4>Recent Tags</h4>
+    <a href="#" class="sidebar-view-all">view all &rsaquo;</a>
+  </header>
+  <ol class="discussion-sidebar-tags-list">
+    <li><a href="#" class="thread-tag">week-1</a><span class="sidebar-tag-count">&times;1348</span></li>
+    <li><a href="#" class="thread-tag">S2V8: Method 3</a><span class="sidebar-tag-count">&times;37</span></li>
+    <li><a href="#" class="thread-tag">artificial-intelligence</a><span class="sidebar-tag-count">&times;128</span></li>
+  <ol>
+</article>
\ No newline at end of file
diff --git a/lms/templates/discussion/_forum.html b/lms/templates/discussion/_forum.html
index cff3b6c1f9..e6bedb21c2 100644
--- a/lms/templates/discussion/_forum.html
+++ b/lms/templates/discussion/_forum.html
@@ -1,18 +1,11 @@
 <%namespace name="renderer" file="_thread.html"/>
 
 <section class="discussion inline-discussion" _id="${discussion_id}">
-  <div class="discussion-non-content discussion-local">
-    <div class="discussion-title-wrapper">
-      <a class="discussion-title" href="javascript:void(0)">Discussion</a>
-    </div>
+
+  <div class="discussion-non-content">
     <div class="search-wrapper">
       <%include file="_search_bar.html" />
-    </div>
-    <div class="search-within">
-      <input type="checkbox" id="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board" checked/>
-      <label for="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board">Search within board</label>
-    </div>
-    <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
+    </div>    
   </div>
   % if len(threads) == 0:
     <div class="blank">
diff --git a/lms/templates/discussion/_inline.html b/lms/templates/discussion/_inline.html
index 306df5c0af..8cc46a7082 100644
--- a/lms/templates/discussion/_inline.html
+++ b/lms/templates/discussion/_inline.html
@@ -1,26 +1,38 @@
 <%namespace name="renderer" file="_thread.html"/>
 
+
+<script type="text/javascript">
+  $('#wmd-input-reply-body').bind('focus', function(e) {
+    $('.new-post-form').removeClass('collapsed');
+  });
+</script>
+
+
 <section class="discussion inline-discussion" _id="${discussion_id}">
-  <div class="discussion-non-content discussion-local">
-    <div class="search-wrapper-inline search-wrapper">
-      <%include file="_search_bar.html" />
-    </div>
-    <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
+
+  <div class="discussion-non-content">
+    <form class="new-post-form collapsed" id="new-post-form" style="display: block; ">
+      <ul class="discussion-errors"></ul>
+      <div class="reply-body"><div class="wmd-panel"><div id="wmd-button-bar-reply-body-502021ba30e78e7d4d00031d"><ul id="wmd-button-row-reply-body-502021ba30e78e7d4d00031d" class="wmd-button-row"><li class="wmd-button" style="left: 0px; " id="wmd-bold-button-reply-body-502021ba30e78e7d4d00031d" title="Strong &lt;strong&gt; Ctrl+B"><span style="background-position: 0px 0px; "></span></li><li class="wmd-button" style="left: 25px; " id="wmd-italic-button-reply-body-502021ba30e78e7d4d00031d" title="Emphasis &lt;em&gt; Ctrl+I"><span style="background-position: -20px 0px; "></span></li><li class="wmd-spacer wmd-spacer1" id="wmd-spacer1-reply-body-502021ba30e78e7d4d00031d"></li><li class="wmd-button" style="left: 75px; " id="wmd-link-button-reply-body-502021ba30e78e7d4d00031d" title="Hyperlink &lt;a&gt; Ctrl+L"><span style="background-position: -40px 0px; "></span></li><li class="wmd-button" style="left: 100px; " id="wmd-quote-button-reply-body-502021ba30e78e7d4d00031d" title="Blockquote &lt;blockquote&gt; Ctrl+Q"><span style="background-position: -60px 0px; "></span></li><li class="wmd-button" style="left: 125px; " id="wmd-code-button-reply-body-502021ba30e78e7d4d00031d" title="Code Sample &lt;pre&gt;&lt;code&gt; Ctrl+K"><span style="background-position: -80px 0px; "></span></li><li class="wmd-button" style="left: 150px; " id="wmd-image-button-reply-body-502021ba30e78e7d4d00031d" title="Image &lt;img&gt; Ctrl+G"><span style="background-position: -100px 0px; "></span></li><li class="wmd-spacer wmd-spacer2" id="wmd-spacer2-reply-body-502021ba30e78e7d4d00031d"></li><li class="wmd-button" style="left: 200px; " id="wmd-olist-button-reply-body-502021ba30e78e7d4d00031d" title="Numbered List &lt;ol&gt; Ctrl+O"><span style="background-position: -120px 0px; "></span></li><li class="wmd-button" style="left: 225px; " id="wmd-ulist-button-reply-body-502021ba30e78e7d4d00031d" title="Bulleted List &lt;ul&gt; Ctrl+U"><span style="background-position: -140px 0px; "></span></li><li class="wmd-button" style="left: 250px; " id="wmd-heading-button-reply-body-502021ba30e78e7d4d00031d" title="Heading &lt;h1&gt;/&lt;h2&gt; Ctrl+H"><span style="background-position: -160px 0px; "></span></li><li class="wmd-button" style="left: 275px; " id="wmd-hr-button-reply-body-502021ba30e78e7d4d00031d" title="Horizontal Rule &lt;hr&gt; Ctrl+R"><span style="background-position: -180px 0px; "></span></li><li class="wmd-spacer wmd-spacer3" id="wmd-spacer3-reply-body-502021ba30e78e7d4d00031d"></li><li class="wmd-button" style="left: 325px; " id="wmd-undo-button-reply-body-502021ba30e78e7d4d00031d" title="Undo - Ctrl+Z"><span style="background-position: -200px -20px; "></span></li><li class="wmd-button" style="left: 350px; " id="wmd-redo-button-reply-body-502021ba30e78e7d4d00031d" title="Redo - Ctrl+Shift+Z"><span style="background-position: -220px -20px; "></span></li></ul></div><textarea class="wmd-input" id="wmd-input-reply-body" placeholder="Post a question or comment…"></textarea><div id="wmd-preview-reply-body-502021ba30e78e7d4d00031d" class="wmd-panel wmd-preview"></div></div></div>
+      <div class="post-options">
+        <input type="checkbox" class="discussion-post-anonymously" id="discussion-post-anonymously-502021ba30e78e7d4d00031d">
+        <label for="discussion-post-anonymously-502021ba30e78e7d4d00031d">post anonymously</label>
+        <input type="checkbox" class="discussion-auto-watch" id="discussion-autowatch-502021ba30e78e7d4d00031d" checked="">
+        <label for="discussion-auto-watch-502021ba30e78e7d4d00031d">follow this thread</label>
+      </div>
+      <div class="reply-post-control">        
+        <a class="discussion-submit-post control-button" href="javascript:void(0)">Submit</a>
+      </div>
+    </form>
   </div>
-  % if len(threads) == 0:
-    <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
+
+  <div class="threads">
+    % for thread in threads:
+      ${renderer.render_thread(course_id, thread, show_comments=False)}
+    % endfor
+  </div>
+
+  <%include file="_paginator.html" />
 </section>
 
 <%!
@@ -36,3 +48,5 @@
   }
   $$annotated_content_info = $.extend($$annotated_content_info, JSON.parse("${annotated_content_info | escape_quotes}"));
 </script>
+
+
diff --git a/lms/templates/discussion/_sort.html b/lms/templates/discussion/_sort.html
index 95dfcead4a..bcbac162ba 100644
--- a/lms/templates/discussion/_sort.html
+++ b/lms/templates/discussion/_sort.html
@@ -3,9 +3,9 @@
 <%def name="link_to_sort(key, title)">
   % if key == sort_key:
     % if sort_order.lower() == 'desc':
-      ${_link_to_sort(key, 'asc', title + ' &#x25BC;', 'sorted')}
+      ${_link_to_sort(key, 'asc', title + '', 'sorted')}
     % else:
-      ${_link_to_sort(key, 'desc', title + ' &#x25B2;', 'sorted')}
+      ${_link_to_sort(key, 'desc', title + '', 'sorted')}
     % endif
   % else:
     ${_link_to_sort(key, 'desc', title)}
@@ -22,14 +22,14 @@
   %>
   <a class="discussion-sort-link ${cls}" href="javascript:void(0)" sort-url="${url_for_sort(key, order)}">${title}</a>
 </%def>
-    
-<div class="discussion-sort discussion-local">
-  Sort by:
+
+<div class="discussion-sort">
+  <span class="discussion-label">Sort by:</span>
+  ${link_to_sort('top', 'top')}
+  
   ${link_to_sort('date', 'date')}
-  |
-  ${link_to_sort('activity', 'activity')}
-  |
+  
   ${link_to_sort('votes', 'votes')}
-  |
+  
   ${link_to_sort('comments', 'comments')}
 </div>
diff --git a/lms/templates/discussion/_thread.html b/lms/templates/discussion/_thread.html
index 4e93e514d1..e4ffe25e53 100644
--- a/lms/templates/discussion/_thread.html
+++ b/lms/templates/discussion/_thread.html
@@ -36,10 +36,10 @@
 <%def name="render_content(content, type, **kwargs)">
   <div class="discussion-content">
     <div class="discussion-content-wrapper clearfix">
-      <div class="follow-wrapper">
-      </div>
+      
       ${render_vote(content)}
       <div class="discussion-right-wrapper clearfix">
+        
         ${render_title(content, type, **kwargs)}
         <div class="discussion-content-view">
           % if content.get('highlighted_body', None):
@@ -83,18 +83,23 @@
 </%def>
 
 <%def name="render_bottom_bar(content, type, **kwargs)">
-  <div class="info">
-    ${render_info(content)}
-    ${render_link("discussion-link discussion-reply discussion-reply-" + type, "Reply")}
-    ${render_link("discussion-link discussion-edit", "Edit")}
-    % if type == "comment" and request.user.is_staff:
-      % if content['endorsed']:
-        <input type="checkbox" checked="checked" class="discussion-link discussion-endorse" id="discussion-endorse-${content['id']}">
-      % else:
-        <input type="checkbox" class="discussion-link discussion-endorse" id="discussion-endorse-${content['id']}">
+  <div class="info">    
+      ${render_info(content)}
+    <ul class="discussion-actions">
+      <li>${render_link("discussion-link discussion-reply discussion-reply-" + type, "Reply")}</li>
+      <li><div class="follow-wrapper"></div></li>
+      <li>${render_link("discussion-link discussion-edit", "Edit")}</li>
+      <li>
+      % if type == "comment" and request.user.is_staff:
+        % if content['endorsed']:
+          <input type="checkbox" checked="checked" class="discussion-link discussion-endorse" id="discussion-endorse-${content['id']}">
+        % else:
+          <input type="checkbox" class="discussion-link discussion-endorse" id="discussion-endorse-${content['id']}">
+        % endif
+        <label class="discussion-link" for="discussion-endorse-${content['id']}">Endorsed</label>
       % endif
-      <label class="discussion-link" for="discussion-endorse-${content['id']}">Endorsed</label>
-    % endif
+      </li>
+    </ul>
   </div>
 </%def>
 
@@ -109,7 +114,13 @@
   </div>
   <div class="comment-count">
     % if content.get('comments_count', -1) >= 0:
-     <a href="javascript:void(0)" class="discussion-show-comments"> Show ${content['comments_count']} comment(s)</a>
+      <a href="javascript:void(0)" class="discussion-show-comments"> 
+      % if content.get('comments_count', -1) >= 2:
+        Show ${content['comments_count']} comments
+      % else:
+        Show ${content['comments_count']} comment
+      % endif
+      </a>
     % endif
   </div>
 </%def>
@@ -120,8 +131,8 @@
 
 <%def name="render_vote(content)">
   <div class="discussion-votes">
-    ${render_link("discussion-vote discussion-vote-up", "&#x2C4;")}
+    ${render_link("discussion-vote discussion-vote-up", "&#9650;")}
     <div class="discussion-votes-point">${content['votes']['point']}</div>
-    ${render_link("discussion-vote discussion-vote-down", "&#x2C5;")}
+    ${render_link("discussion-vote discussion-vote-down", "&#9660;")}
   </div>
 </%def>