diff --git a/templates/ceph_bench_html.j2 b/templates/ceph_bench_html.j2
index 4e04560..f1f767b 100644
--- a/templates/ceph_bench_html.j2
+++ b/templates/ceph_bench_html.j2
@@ -448,7 +448,7 @@
                 </div>
             </td>
         </tr>
-        {% for time,dt in results.items() %}
+        {% for time,dt in results.items() | sort %}
         {% set t = dt["totals"] %}
         {% set o = dt["input_options"] %}
         {% set tstripped = time | tstrip %}
@@ -700,7 +700,7 @@
                 </div>
             </td>
         </tr>
-        {% for time,dt in results.items() %}
+        {% for time,dt in results.items() | sort %}
         {% set b = dt["osd_summary"]["before"] %}
         {% set a = dt["osd_summary"]["after"] %}
         {% set s = dt["osd_summary"]["active"] %}
diff --git a/templates/ceph_info_html.j2 b/templates/ceph_info_html.j2
index ac4d83f..49371df 100644
--- a/templates/ceph_info_html.j2
+++ b/templates/ceph_info_html.j2
@@ -142,7 +142,7 @@
         }
         td > .osdconf_group {
             display: inline-block;
-            grid-template-columns: repeat(3, auto);
+            grid-template-columns: repeat(4, auto);
             padding-left: 0px;
             padding-right: 0px;
             margin: 1px;
@@ -227,9 +227,13 @@
         .lat_apply { border-color: #a0c0c0; background-color: rgb(255, 250, 250); text-align: left;  width: 35px}
         .meta_name { border-color: #c4b890; background-color: #e7dbb6; text-align: left; width: 150px;}
         .meta_value { border-color: #c6c3ba;background-color: #d4d4d4; text-align: left; width: 480px;}
-        .conf_name { border-color: #c4b890; background-color: #e7dbb6; text-align: left; width: 295px; word-break: break-all;}
-        .conf_value { border-color: #c6c3ba;background-color: #d4d4d4; text-align: left; width: 280px; word-break: break-all;}
-        .conf_source { border-color: #c6c3ba;background-color: #a4a4a4; text-align: left; width: 50px;}
+        .conf_name, .conf_name_uniq { border-color: #c4b890; background-color: #e7dbb6; text-align: left; width: 295px; word-break: break-all;}
+        .conf_value, .conf_value_uniq { border-color: #c6c3ba;background-color: #d4d4d4; text-align: left; width: 280px; word-break: break-all;}
+        .conf_source, .conf_source_uniq { border-color: #c6c3ba;background-color: #a4a4a4; text-align: left; width: 50px;}
+        .osd_name { border-color: gray; background-color: #bdb396; text-align: left; width: 120px;}
+        .conf_name_uniq { width: 410px;}
+        .conf_value_uniq { width: 600px;}
+        .conf_source_uniq { width: 140px;}
 
         .map_grid {
             display: grid;
@@ -664,22 +668,23 @@
             </td></tr>
         </tbody></table>
     </div>
-    {% for osdname in cuniq.keys() | sort %}
-    <button type="button" class="row_button">{{ osdname }}: {{ cuniq[osdname] | length }} uniq values</button>
+    <button type="button" class="row_button">Uniq values</button>
     <div class="row_content">
         <table class="ceph_status"><tbody>
+            {% for osdname in cuniq.keys() | sort %}
             <tr><td class="metadata">
             {% for tname, tdata in cuniq[osdname].items() %}
                 <div class="osdconf_group">
-                    <div class="item conf_name">{{ tname }}</div>
-                    <div class="item conf_value">{{ tdata["value"] }}</div>
-                    <div class="item conf_source">{{ tdata["source"] }}</div>
+                    <div class="item osd_name">{{ osdname }}</div>
+                    <div class="item conf_name_uniq">{{ tname }}</div>
+                    <div class="item conf_value_uniq">{{ tdata["value"] }}</div>
+                    <div class="item conf_source_uniq">{{ tdata["source"] }}</div>
                 </div>
             {% endfor %}
             </td></tr>
+            {% endfor %}
         </tbody></table>
     </div>
-    {% endfor %}
 </div>
 {% endmacro %}