diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
index 0d7a286015..a4bb943eef 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
@@ -112,8 +112,8 @@
 
                 var createPercentageMetrics = function (metricName, window) {
                     groupedMetrics.percentiles = groupedMetrics['percentiles'] || {}
-                    groupedMetrics.percentiles[metricName] = groupedMetrics.percentiles[metricName] || {};
-                    groupedMetrics.percentiles[metricName][window] = groupedMetrics.percentiles[metricName][window] || {
+                    groupedMetrics.percentiles[window] = groupedMetrics.percentiles[window] || {};
+                    groupedMetrics.percentiles[window][metricName] = groupedMetrics.percentiles[window][metricName] || {
                             graphdata: [{
                                 key: window,
                                 values: []
@@ -134,7 +134,7 @@
                         createPercentageMetrics(metricName, window);
 
 
-                        groupedMetrics.percentiles[metricName][window].graphdata[0]
+                        groupedMetrics.percentiles[window][metricName].graphdata[0]
                             .values.push({
                             label: percentage,
                             value: metrics[key]
@@ -169,7 +169,7 @@
                         var metricName = percentileNumOps[1];
                         var window = percentileNumOps[2];
                         createPercentageMetrics(metricName, window);
-                        groupedMetrics.percentiles[metricName][window].numOps = metrics[key];
+                        groupedMetrics.percentiles[window][metricName].numOps = metrics[key];
                     } else if (isIgnoredJmxKeys(key)) {
                         //ignore
                     } else {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/rpc-metrics.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/rpc-metrics.html
index a31bdcf03b..81b76cf335 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/rpc-metrics.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/rpc-metrics.html
@@ -20,14 +20,17 @@
     (eg. set to <b>60,300</b>) in your hdfs-site.xml
     to display Hadoop RPC related graphs.
 </div>
-<div ng-repeat="(metric,percentiles) in $ctrl.metrics.percentiles">
-    <h2>{{metric}}</h2>
+<div ng-repeat="(window,windowed) in $ctrl.metrics.percentiles">
+    <h2>{{window}} window</h2>
+    <p>Quantiles based on a fixed {{window}} window. Calculated once at every
+        {{window}}</p>
 
     <div class="container">
-        <div class="col-md-6" ng-repeat="(window,windowed) in percentiles">
-            <h3>{{window}} window ({{windowed.numOps}} request)</h3>
+        <div class="col-md-6" ng-repeat="(metric,percentiles) in windowed">
+            <h3>{{metric}}</h3>
+            <p>{{percentiles.numOps}} sample</p>
             <nvd3 options="$ctrl.percentileGraphOptions"
-                  data="windowed.graphdata"></nvd3>
+                  data="percentiles.graphdata"></nvd3>
         </div>
     </div>