diff --git a/common/static/common/templates/discussion/thread-show.underscore b/common/static/common/templates/discussion/thread-show.underscore
index 8cb3469866..bf3a327571 100644
--- a/common/static/common/templates/discussion/thread-show.underscore
+++ b/common/static/common/templates/discussion/thread-show.underscore
@@ -1,7 +1,7 @@
 <div class="discussion-post">
     <header class="wrapper-post-header">
         <div class="post-header-content">
-            <h1 class="post-title"><%- title %></h1>
+            <h4 class="post-title"><%- title %></h4>
             <p class="posted-details">
             <%
             var timeAgoHtml = interpolate(
diff --git a/lms/djangoapps/discussion/tests/test_views.py b/lms/djangoapps/discussion/tests/test_views.py
index 25aaa658f9..5ed2bce1c5 100644
--- a/lms/djangoapps/discussion/tests/test_views.py
+++ b/lms/djangoapps/discussion/tests/test_views.py
@@ -1081,9 +1081,7 @@ class InlineDiscussionTestCase(ForumsEnableMixin, ModuleStoreTestCase):
         """Verifies that the response contains the appropriate courseware_url and courseware_title"""
         self.assertEqual(response.status_code, 200)
         response_data = json.loads(response.content)
-        expected_courseware_url = '/courses/TestX/101/Test_Course/jump_to/i4x://TestX/101/discussion/Discussion1'
         expected_courseware_title = 'Chapter / Discussion1'
-        self.assertEqual(response_data['discussion_data'][0]['courseware_url'], expected_courseware_url)
         self.assertEqual(response_data["discussion_data"][0]["courseware_title"], expected_courseware_title)
 
     def test_courseware_data(self, mock_request):
diff --git a/lms/djangoapps/discussion/views.py b/lms/djangoapps/discussion/views.py
index 69afefb463..b70c72b113 100644
--- a/lms/djangoapps/discussion/views.py
+++ b/lms/djangoapps/discussion/views.py
@@ -444,6 +444,8 @@ def user_profile(request, course_key, user_id):
 
         is_staff = has_permission(request.user, 'openclose_thread', course.id)
         threads = [utils.prepare_content(thread, course_key, is_staff) for thread in threads]
+        with newrelic.agent.FunctionTrace(nr_transaction, "add_courseware_context"):
+            add_courseware_context(threads, course, request.user)
         if request.is_ajax():
             return utils.JsonResponse({
                 'discussion_data': threads,
diff --git a/lms/static/sass/discussion/_discussion.scss b/lms/static/sass/discussion/_discussion.scss
index 36b9922966..275bd1ecf0 100644
--- a/lms/static/sass/discussion/_discussion.scss
+++ b/lms/static/sass/discussion/_discussion.scss
@@ -202,10 +202,6 @@ body.discussion {
     }
   }
 
-  .responses li header {
-    margin-bottom: $baseline;
-  }
-
   blockquote {
     background: $gray-l5;
     border-radius: $forum-border-radius;
diff --git a/lms/static/sass/discussion/_layouts.scss b/lms/static/sass/discussion/_layouts.scss
index 55107aa108..90d78a7bd2 100644
--- a/lms/static/sass/discussion/_layouts.scss
+++ b/lms/static/sass/discussion/_layouts.scss
@@ -34,6 +34,10 @@
         padding: 0;
         font-size: $forum-base-font-size;
     }
+
+    .response-count {
+        @include margin-right($baseline / 4);
+    }
 }
 
 .discussion-column {
diff --git a/lms/static/sass/discussion/elements/_navigation.scss b/lms/static/sass/discussion/elements/_navigation.scss
index 2036e985b8..7ed8075491 100644
--- a/lms/static/sass/discussion/elements/_navigation.scss
+++ b/lms/static/sass/discussion/elements/_navigation.scss
@@ -191,7 +191,7 @@
     }
 
     .thread-preview-body {
-        margin-top: $baseline / 4;
+        @include margin($baseline / 4, $baseline, 0, 0);
         color: $forum-color-response-count;
         font-size: $forum-small-font-size;
         overflow: hidden;
diff --git a/lms/static/sass/discussion/views/_thread.scss b/lms/static/sass/discussion/views/_thread.scss
index 7320629205..5201e6514a 100644
--- a/lms/static/sass/discussion/views/_thread.scss
+++ b/lms/static/sass/discussion/views/_thread.scss
@@ -14,7 +14,7 @@
     padding: 0 ($baseline/2);
 
     .wrapper-post-header {
-        padding-bottom: 0;
+        padding-bottom: $baseline;
     }
 
     .post-header-content {