diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 2873e37e73..b63e04d20e 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -222,7 +222,7 @@ section.combined-open-ended-status {
 
 .wrappable {
   display: table-cell;
-  padding: $baseline/4 0 ;
+  padding: $baseline/4;
 }
 
 .rubric-list-item {
@@ -238,7 +238,9 @@ span.rubric-category {
   display: block;
   width: 100%;
   border-bottom: 1px solid lightgray;
-  font-size: .9em;
+  font-size: 1.1em;
+  padding-top: $baseline/2;
+  margin-bottom: $baseline/2;
 }
 
 div.combined-rubric-container {
@@ -591,7 +593,8 @@ section.open-ended-child {
       overflow-y: auto;
       margin-bottom: 0;
       padding: $baseline/2;
-      height: 200px;
+      height: auto;
+      min-height: 20px;
       border: 1px solid #ddd;
       background: #f6f6f6;
     }
@@ -668,6 +671,7 @@ section.open-ended-child {
         &.rubric-list-item {
           margin-bottom: 0;
           padding: 0;
+          border-radius: $baseline/4;
          }
       }
     }
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index b539c72554..4ae1f9156a 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -623,9 +623,9 @@ class @CombinedOpenEnded
     info_rubric_elements = @$(@info_rubric_elements_sel)
     info_rubric_elements.slideToggle()
     @rubric_header = @$(@rubric_collapse_sel)
-    if @rubric_header.text() == "(Hide)"
-      new_text = "(Show)"
+    if @rubric_header.text() == "Show Score Only"
+      new_text = "Show Full Rubric"
     else
-      new_text = "(Hide)"
+      new_text = "Show Score Only"
     @rubric_header.text(new_text)
     return false
diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss
index 294ac86d78..6c1467bfb8 100644
--- a/lms/static/sass/course/_rubric.scss
+++ b/lms/static/sass/course/_rubric.scss
@@ -1,56 +1,78 @@
+.rubric-header {
+  .rubric-collapse {
+    float: right;
+  }
+}
+
 .rubric {
-  margin: 0px 0px;
+  margin: 0;
   color: #3C3C3C;
+  
   tr {
-      margin:0px 0px;
-      height: 100%;
+    margin: 0;
+    height: 100%;
   }
+
   td {
-      height: 100%;
-      border: 1px black solid;
-      text-align: center;
+    height: 100%;
+    border: 1px black solid;
+    text-align: center;
   }
+
   th {
-      padding: 5px;
-      margin: 5px;
-      text-align: center;
+    margin: $baseline/4;
+    padding: $baseline/4;
+    text-align: center;
   }
+
   .points-header th {
-      padding: 0px;
+    padding: 0px;
   }
-  .rubric-label
-  {
-      position: relative;
-      font-size: .9em;
-      display: block;
+
+  .rubric-label {
+    position: relative;
+    display: block;
+    font-size: .9em;
+
+    .choicegroup-correct {
+      //nothing
+    }
+
+    .choicegroup-incorrect {
+      display:none;
+    }
   }
+
   .grade {
     position: absolute;
-    bottom:0px;
-    right:0px;
+    bottom: 0;
+    right: 0;
   }
   .selected-grade,
   .selected-grade .rubric-label {
     background: #666;
     color: white; 
   }
-   input[type=radio]:checked + .rubric-label {
+
+  input[type=radio]:checked + .rubric-label {
     background: white;
     color: $base-font-color;
     white-space:nowrap;
-    }
+  }
+
   .wrappable {
-      white-space:normal;
+    white-space:normal;
   }
+
   input[class='score-selection'] {
-      position: relative;
-      font-size: 16px;
+    position: relative;
+    font-size: 16px;
   }
-  ul.rubric-list
-  {
-      list-style-type: none;
-      padding:0;
-      margin:0;
+
+  ul.rubric-list {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
   }
 }
 
diff --git a/lms/templates/combinedopenended/combined_open_ended.html b/lms/templates/combinedopenended/combined_open_ended.html
index 7668312e0e..ef73a09bcc 100644
--- a/lms/templates/combinedopenended/combined_open_ended.html
+++ b/lms/templates/combinedopenended/combined_open_ended.html
@@ -30,11 +30,7 @@
             <div class="visibility-control visibility-control-prompt">
                 <div class="inner">
                 </div>
-<<<<<<< HEAD
-                <span class="section-header question-header section-header-prompt">Prompt</span>
-=======
-                <a href="" class="question-header">Hide Prompt</a>
->>>>>>> 932bbd259247f5b69f2d39c0a1945951816fedeb
+                <a href="" class="section-header section-header-prompt question-header">Hide Prompt</a>
             </div>
             <div class="problem-container">
             % for item in items:
diff --git a/lms/templates/combinedopenended/combined_open_ended_results.html b/lms/templates/combinedopenended/combined_open_ended_results.html
index 84f186fbb6..125bab2444 100644
--- a/lms/templates/combinedopenended/combined_open_ended_results.html
+++ b/lms/templates/combinedopenended/combined_open_ended_results.html
@@ -6,7 +6,15 @@
         % else:
             status="hidden">
         % endif
-            <h4>${result['task_name']} from grader ${i+1} <a class="rubric-collapse" href="#">(Hide)</a></h4>
+            <div class="visibility-control visibility-control-rubric">
+                <div class="inner">
+                </div>
+                <span class="section-header section-header-rubric">Submitted Rubric</span>
+            </div>
+            <div class="rubric-header"> 
+                ${result['task_name']} from grader ${i+1} 
+                <button class="rubric-collapse" href="#">Show Score Only</button>
+            </div>
             ${result['result'] | n}
         </div>
     %endif
diff --git a/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html b/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html
index 9ae148442f..ab9e751672 100644
--- a/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html
+++ b/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html
@@ -8,17 +8,18 @@
             <li class="rubric-list-item">
                 <div class="rubric-label">
                     %if len(category['options'][j]['grader_types'])>0:
-                       %if correct[i]==1:
-                        <label class="choicegroup_correct">
-                       %else:
-                        <label class="choicegroup_incorrect">
-                       %endif
-                       ${option['points']} points : ${option['text']}
+                        %if correct[i]==1:
+                            <label class="choicegroup_correct wrapper-score-selection"></label>
+                        %else:
+                            <label class="choicegroup_incorrect wrapper-score-selection"></label>
+                        %endif
+                            <span class="wrappable"> ${option['points']} points : ${option['text']}</span>
                         </label>
                     %else:
-                         <label class="rubric-elements-info">
-                             ${option['points']} points : ${option['text']}
-                         </label>
+                        <label class="rubric-elements-info">
+                            <span class="wrapper-score-selection"> </span>
+                            <span class="wrappable"> ${option['points']} points : ${option['text']}</span>
+                        </label>
                     %endif
                 </div>
             </li>
diff --git a/lms/templates/combinedopenended/openended/open_ended_rubric.html b/lms/templates/combinedopenended/openended/open_ended_rubric.html
index c015a32d2d..df0704a263 100644
--- a/lms/templates/combinedopenended/openended/open_ended_rubric.html
+++ b/lms/templates/combinedopenended/openended/open_ended_rubric.html
@@ -8,7 +8,7 @@
     <div class="rubric">
         % for i in range(len(categories)):
         <% category = categories[i] %>
-            <span class="rubric-category">${category['description']}</span> <br/>
+            <span class="rubric-category">${category['description']}</span>
             <ul class="rubric-list">
                 % for j in range(len(category['options'])):
                 <% option = category['options'][j] %>