diff --git a/lms/static/coffee/src/discussion/content.coffee b/lms/static/coffee/src/discussion/content.coffee
index 25683d00d9..bb53739732 100644
--- a/lms/static/coffee/src/discussion/content.coffee
+++ b/lms/static/coffee/src/discussion/content.coffee
@@ -13,17 +13,6 @@ Discussion = @Discussion
 
     id = $content.attr("_id")
 
-    discussionContentHoverIn = ->
-      status = $discussionContent.attr("status") || "normal"
-      $local(".discussion-link").show()
-      if status == "reply"
-        $local(".discussion-reply").hide()
-
-    discussionContentHoverOut = ->
-      $local(".discussion-link").hide()
-
-    $discussionContent.children(".discussion-content-wrapper").hover(discussionContentHoverIn, discussionContentHoverOut)
-
     handleReply = (elem) ->
       $replyView = $local(".discussion-reply-new")
       if $replyView.length
diff --git a/lms/static/coffee/src/discussion/discussion.coffee b/lms/static/coffee/src/discussion/discussion.coffee
index 26398be6ac..936c604e67 100644
--- a/lms/static/coffee/src/discussion/discussion.coffee
+++ b/lms/static/coffee/src/discussion/discussion.coffee
@@ -58,7 +58,7 @@ initializeFollowThread = (index, thread) ->
   $thread = $(thread)
   id = $thread.attr("_id")
   $thread.children(".discussion-content")
-         .find(".info")
+         .find(".follow-wrapper")
          .append(subscriptionLink('thread', id))
 
 @Discussion = $.extend @Discussion,
diff --git a/lms/static/coffee/src/discussion/templates.coffee b/lms/static/coffee/src/discussion/templates.coffee
index 1cfc30a7cd..4a3f45693c 100644
--- a/lms/static/coffee/src/discussion/templates.coffee
+++ b/lms/static/coffee/src/discussion/templates.coffee
@@ -54,7 +54,9 @@ Discussion = @Discussion
     <form class="discussion-content-edit discussion-comment-edit" _id="{{id}}">
       <ul class="discussion-errors discussion-update-errors"></ul>    
       <div class="comment-body-edit body-input">{{body}}</div>
-      <a class="discussion-submit-update control-button" href="javascript:void(0)">Update</a>
-      <a class="discussion-cancel-update control-button" href="javascript:void(0)">Cancel</a>
+      <div class = "edit-post-control">
+        <a class="discussion-cancel-update" href="javascript:void(0)">Cancel</a>
+        <a class="discussion-submit-update control-button" href="javascript:void(0)">Update</a>
+      </div>
     </form>
   """
diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 258985d66c..92251c0cc8 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -120,6 +120,14 @@ $discussion_input_width: 100%;
       }
     }
   }
+  .follow-wrapper {
+    float: right;
+    margin-top: -1.5%;
+    .discussion-link {
+      display: inline;
+      font-size: $comment_info_size;
+    }
+  }
   .discussion-votes {
     text-align: center;
     height: flex-grid(3);
@@ -193,13 +201,17 @@ $discussion_input_width: 100%;
     }
   }
   .discussion-content-edit, .discussion-reply-new, .new-post-form {
-    .new-post-control, .edit-post-control {
+    .new-post-control {
       margin-left: 80%;
       margin-top: 1%;
     }
     .reply-post-control {
       margin-left: 73%;
     }
+    .edit-post-control {
+      margin-left: 79%;
+      margin-top: -1%;
+    }
     .control-button {
       @include button;
       @include discussion-font;
@@ -271,9 +283,8 @@ $discussion_input_width: 100%;
       .discussion-link {
         @include discussion-font;
         margin-left: 2px;
-        display: inline-block;
         color: #1d9dd9;
-        display: none;
+        display: inline;
       }
       
     }
diff --git a/lms/templates/discussion/_thread.html b/lms/templates/discussion/_thread.html
index a2ea83b520..108b7c8ae5 100644
--- a/lms/templates/discussion/_thread.html
+++ b/lms/templates/discussion/_thread.html
@@ -36,6 +36,8 @@
 <%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)}