diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index c2a3a8b850..afa80b16a4 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -68,7 +68,7 @@
   font-family: 'Monaco', monospace;
   font-size: 13px;
   line-height: 1.6;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15) inset;
+  box-shadow: 0 1px 3px $black-t0 inset;
 }
 
 @mixin discussion-wmd-preview {
@@ -1365,35 +1365,27 @@ body.discussion {
     }
   }
 
-  .helpgrid-list {
-    list-style-type: none;
-    padding: 0;
-    margin: 0;
-
-
-    .helpgrid-row {
+  .helpgrid-row {
       border-bottom: 1px solid #b2b2b2;
 
       .row-title {
         padding: 30px $baseline;
-        display: inline-block;
-        width: 15%;
+        //width: 15%;
         background-color: $gray-l4;
         font-size: 12px;
       }
 
       .row-item-full, .row-item {
-        display: inline-block;
         font-size: 12px;
         padding-left: $baseline/2;
-        width: 23%;
+        width: 30%;
         vertical-align: middle;
 
         .icon {
           padding: 0 $baseline/2;
           font-size: 24px;
-          display: inline-block;
           vertical-align: middle;
+          display: table-cell;
         }
 
         .icon-stack i {
@@ -1401,22 +1393,23 @@ body.discussion {
         }
 
         .row-description {
-          display: inline-block;
-          width: 70%;
           vertical-align: middle;
+          display: table-cell;
         }
       }
 
       .row-item-full {
-        width: 77%;
+
+        .row-setting {
+          display: table-cell;
+          vertical-align: middle;
+        }
 
         .row-description {
-          width: 80%;
           padding-left: 15px;
         }
       }
     }
-  }
 
   .helpgrid-row-navigation {
     .icon-reorder {color: $light-gray;}
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index ff28b0cfc0..d396cc3156 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -22,82 +22,77 @@
 <%include file="_new_post.html" />
 
 <section class="discussion container" id="discussion-container" data-roles="${roles}" data-course-id="${course_id}" data-user-info="${user_info}" data-threads="${threads}" data-thread-pages="${thread_pages}" data-content-info="${annotated_content_info}" data-flag-moderator="${flag_moderator}">
-	<div class="discussion-body">
-		<div class="sidebar"></div>
-		<div class="discussion-column">
-			<div class="discussion-article blank-slate">
-				<section class="home-header">
-					<span class="label">DISCUSSION HOME:</span>
-					<h1 class="home-title">${course.display_name_with_default}</h1>
-					<p class="home-description">Welcome to ${course.display_name_with_default}s Discussion Home. Select a discussion from the left, or review your profile, participation and email notification settings below.  
-					</p>
-				</section>
-				<section class="home-stats">
-					<div class="label-area">
-						<span class="label"> PROFILE, PARTICIPATION</span>
-						<a href="#" class="profile-link">Your profile Name</a>
-					</div>
-					<div class="stats-grouping">
-						<div class="profile-stat profile-stat-posts">
-							<span class="count count-posts">5</span>
-							<span class="profile-stat-label">POSTS</span>
-						</div>
-						<div class="profile-stat profile-stat-comments">
-							<span class="count count-comments">12</span>
-							<span class="profile-stat-label">COMMENTS</span>
-						</div>
-						<div class="profile-stat profile-stat-following">
-							<span class="count count-following">9</span>
-						 	<span class="profile-stat-label">FOLLOWING</span>
-						</div>
-					</div>
-				</section>
-				<span class="label label-settings">HOW TO USE EDX DISCUSSIONS</span>
-				<section class="home-helpgrid">
-					<ul class="helpgrid-list">
-						<li class="helpgrid-row helpgrid-row-navigation">
-							<span class="row-title">Find discussions</span>
-							<div class="row-item">
-								<i class="icon icon-reorder"></i>
-								<span class="row-description">Focus in on specific topics</span>
-							</div>
-							<div class="row-item">
-								<i class="icon icon-search"></i>
-								<span class="row-description">Search for specific posts </span>
-							</div>
-							<div class="row-item">
-								<i class="icon icon-sort"></i>
-								<span class="row-description">Sort by date, vote, or comments </span>
-							</div>
-						</li>
-						<li class="helpgrid-row helpgrid-row-participation">
-							<span class="row-title">Engage with posts</span>
-							<div class="row-item">
-								<i class="icon icon-plus"></i>
-								<span class="row-description">Upvote posts and good responses</span>
-							</div>
-							<div class="row-item">
-								<i class="icon icon-flag"></i>
-								<span class="row-description">Report Forum Misuse</span>
-							</div>
-							<div class="row-item">
-								<i class="icon icon-star"></i>
-								<span class="row-description">Follow posts for updates</span>
-							</div>
-						</li>
-						<li class="helpgrid-row helpgrid-row-notification">
-							<span class="row-title">Receive updates</span>
-							<div class="row-item-full">
-								<i class="icon icon-envelope"></i>
+    <div class="discussion-body">
+        <div class="sidebar"></div>
+        <div class="discussion-column">
+        	<div class="discussion-article blank-slate">
+	        	<section class="home-header">
+	        		<span class="label">DISCUSSION HOME:</span>
+	        		<h1 class="home-title">${course.display_name_with_default}</h1>
+	        	</section>
+	        	<section class="home-stats">
+	        		<div class="label-area">
+		        		<span class="label"> PROFILE, PARTICIPATION</span>
+		        		<a href="#" class="profile-link">Your profile Name</a>
+	        		</div>
+	        		<div class="stats-grouping">
+		        		<div class="profile-stat profile-stat-posts">
+		        			<span class="count count-posts">5</span>
+		        			<span class="profile-stat-label">POSTS</span>
+		        		</div>
+		        		<div class="profile-stat profile-stat-comments">
+		        			<span class="count count-comments">12</span>
+		        			<span class="profile-stat-label">COMMENTS</span>
+		        		</div>
+		        		<div class="profile-stat profile-stat-following">
+		        			<span class="count count-following">9</span>
+		        		 	<span class="profile-stat-label">FOLLOWING</span>
+		        		</div>
+		        	</div>
+	        	</section>
+	        	<span class="label label-settings">HOW TO USE EDX DISCUSSIONS</span>
+	        	<table class="home-helpgrid">
+		        		<tr class="helpgrid-row helpgrid-row-navigation">
+		        			<td class="row-title">Find discussions</td>
+		        			<td class="row-item">
+		        				<i class="icon icon-reorder"></i>
+		        				<span class="row-description">Focus in on specific topics</span>
+	        				</td>
+		        			<td class="row-item">
+		        				<i class="icon icon-search"></i>
+		        				<span class="row-description">Search for specific posts </span>
+		        			</td>
+		        			<td class="row-item">
+		        				<i class="icon icon-sort"></i>
+		        				<span class="row-description">Sort by date, vote, or comments </span>
+		        			</td>
+		        		</tr>
+		        		<tr class="helpgrid-row helpgrid-row-participation">
+		        			<td class="row-title">Engage with posts</td>
+		        			<td class="row-item">
+		        				<i class="icon icon-plus"></i>
+		        				<span class="row-description">Upvote posts and good responses</span>
+		        			</td>
+		        			<td class="row-item">
+		        				<i class="icon icon-flag"></i>
+		        				<span class="row-description">Report Forum Misuse</span>
+		        			</td>
+		        			<td class="row-item">
+		        				<i class="icon icon-star"></i>
+		        				<span class="row-description">Follow posts for updates</span>
+		        			</td>
+		        		</tr>
+		        		<tr class="helpgrid-row helpgrid-row-notification">
+		        			<td class="row-title">Receive updates</td>
+		        			<td class="row-item-full" colspan="3">
+		        				<i class="icon icon-envelope"></i>
 								<span class="row-setting"><input type="checkbox" name="email-notification"></input></span>
 								<span class="row-description"> If enabled, you will receive an email digest once a day notifying you about new, unread activity from posts you are following. </span>
-							</div>
-						</li>
-					</ul>
-				</section>
-
-			</div>
-		</div>
+							</td>
+		        		</tr>
+	        	</table>
+        	</div>
+        </div>
     </div>
 </section>