diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index f4f78c604b..b3ab2f3c94 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -23,7 +23,7 @@
   height: 35px;
   padding: 0 15px;
   border-radius: 3px;
-  border: 1px solid #444;
+  border: 1px solid #aaa;
   @include linear-gradient(top, #eee, #ccc);
   font-size: 13px;
   font-weight: 700;
@@ -310,6 +310,7 @@ body.discussion {
         @include white-button;
         height: 40px;
         margin-top: 15px;
+        border-color: #444;
         line-height: 36px;
 
         .drop-arrow {
@@ -507,6 +508,7 @@ body.discussion {
 
     .new-post-cancel {
       @include white-button;
+      bordre-color: #444;
       float: left;
       margin: 10px 0 0 15px;
     }
@@ -1560,6 +1562,15 @@ body.discussion {
 .discussion-module {
   @extend .discussion-body;
 
+  .discussion-show {
+    @include white-button;
+    display: inline-block;
+  } 
+
+  .new-post-btn {
+    display: inline-block;
+  }
+
   section.discussion {
   /* Course content p has a default margin-bottom of 1.416em, this is just to reset that */
     .discussion-thread {
@@ -1631,11 +1642,13 @@ body.discussion {
     .new-post-form {
       width: 100%;
       margin-bottom: 20px;
+      padding: 30px;
       border-radius: 3px;
       background: rgba(0, 0, 0, .55);
       color: #fff;
-      box-shadow: 0 1px 2px rgba(0, 0, 0, .5) inset, 0 1px 0 rgba(255, 255, 255, .5);
+      box-shadow: none;
       @include clearfix;
+      @include box-sizing(border-box);
 
       .form-row {
         margin-bottom: 20px;
@@ -1700,6 +1713,22 @@ body.discussion {
         font-weight: 700;
       }
 
+      .tagsinput {
+        padding: 10px;
+        box-sizing: border-box;
+        border: 1px solid #333;
+        border-radius: 3px;
+        background: #fff;
+        font-family: 'Monaco', monospace;
+        font-size: 13px;
+        line-height: 1.6;
+        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset;
+
+        span.tag {
+          margin-bottom: 0;
+        }
+      }
+
       .submit {
         @include blue-button;
         float: left;
@@ -1717,10 +1746,11 @@ body.discussion {
         @include white-button;
         float: left;
         margin: 10px 0 0 15px;
+        border-color: #444;
       }
 
       .options {
-        margin-top: 40px;
+        margin-top: 5px;
 
         label {
           display: inline;
@@ -1763,6 +1793,7 @@ body.discussion {
 
   .new-post-btn {
     @include blue-button;
+    display: inline-block;
     font-size: 13px;
     margin-right: 4px;
   }
@@ -1783,7 +1814,7 @@ body.discussion {
           display: inline-block;
           padding-right: 0.5em;
           a {
-            @include white-button
+            @include white-button;
           }
 
         }
@@ -1800,3 +1831,6 @@ body.discussion {
     }
   }
 }
+
+
+
diff --git a/lms/templates/discussion/mustache/_inline_discussion.mustache b/lms/templates/discussion/mustache/_inline_discussion.mustache
index 14f23389c0..de15431ca1 100644
--- a/lms/templates/discussion/mustache/_inline_discussion.mustache
+++ b/lms/templates/discussion/mustache/_inline_discussion.mustache
@@ -7,24 +7,22 @@
             <div class="new-post-form-errors">
             </div>
             <form class="new-post-form">
-                <div class="right-column">
-                    <div class="form-row">
-                        <input type="text" class="new-post-title" name="title" placeholder="Title">
-                    </div>
-                    <div class="form-row">
-                        <div class="new-post-body" name="body" placeholder="Enter your question or comment&hellip;"></div>
-                        <!---<div class="new-post-preview"><span class="new-post-preview-label">Preview</span></div>-->
-                    </div>
-                    <div class="form-row">
-                        <input type="text" class="new-post-tags" name="tags" placeholder="Tags">
-                    </div>
-                    <input type="submit" class="submit" value="Add post">
-                    <a href="#" class="new-post-cancel">Cancel</a>
-                    <div class="options">
-                        <input type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label for="new-post-follow">follow this post</label>
-                        <br>
-                        <input type="checkbox" name="anonymous" class="discussion-anonymous" id="new-post-anonymous"><label for="new-post-anonymous">post anonymously</label>
-                    </div>
+                <div class="form-row">
+                    <input type="text" class="new-post-title" name="title" placeholder="Title">
+                </div>
+                <div class="form-row">
+                    <div class="new-post-body" name="body" placeholder="Enter your question or comment&hellip;"></div>
+                    <!---<div class="new-post-preview"><span class="new-post-preview-label">Preview</span></div>-->
+                </div>
+                <div class="form-row">
+                    <input type="text" class="new-post-tags" name="tags" placeholder="Tags">
+                </div>
+                <input type="submit" class="submit" value="Add post">
+                <a href="#" class="new-post-cancel">Cancel</a>
+                <div class="options">
+                    <input type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label for="new-post-follow">follow this post</label>
+                    <br>
+                    <input type="checkbox" name="anonymous" class="discussion-anonymous" id="new-post-anonymous"><label for="new-post-anonymous">post anonymously</label>
                 </div>
             </form>
         </div>