diff --git a/templates/ceph_bench_html.j2 b/templates/ceph_bench_html.j2
index 7bdcfcc..1a9e994 100644
--- a/templates/ceph_bench_html.j2
+++ b/templates/ceph_bench_html.j2
@@ -130,7 +130,7 @@
         }
         td > .props_group {
             display: grid;
-            grid-template-columns: 60px 60px 80px 35px 45px 95px 50px 60px 45px;
+            grid-template-columns: 60px 80px 35px 45px 95px 110px;;
             padding-left: 0px;
             padding-right: 0px;
             margin: 1px;
@@ -159,7 +159,7 @@
         }
         td > .bench_run_group {
             display: grid;
-            grid-template-columns: 80px 80px 80px 80px 75px 75px;
+            grid-template-columns: 80px 110px 80px 80px 110px 80px;;
             padding-left: 0px;
             padding-right: 0px;
             margin: 1px;
@@ -429,24 +429,21 @@
             <td class="status">Data point</td>
             <td class="col_properties">
                 <div class="props_group">
-                    <div class="item prop">Warmup</div>
                     <div class="item prop">Run Time</div>
                     <div class="item prop">Storage class</div>
                     <div class="item pg">PGs</div>
                     <div class="item prop">Engine</div>
                     <div class="item prop">Mode</div>
-                    <div class="item prop">BS</div>
-                    <div class="item prop">IOdepth</div>
-                    <div class="item prop">Size</div>
+                    <div class="item prop">BS / IODepth / Size</div>
                 </div>
             </td>
             <td class="col_bench">
                 <div class="bench_run_group">
                     <div class="item bench">Read, MB/s</div>
-                    <div class="item bench">Avg lat, usec</div>
+                    <div class="item bench">Avg/cLat 95p, usec</div>
                     <div class="item bench">Read, op/s</div>
                     <div class="item bench">Write, MB/s</div>
-                    <div class="item bench">Avg lat, usec</div>
+                    <div class="item bench">Avg/cLat 95p, usec</div>
                     <div class="item bench">Write, op/s</div>
                 </div>
             </td>
@@ -461,24 +458,21 @@
             <td class="status">All agents</td>
             <td class="col_properties">
                 <div class="props_group">
-                    <div class="item prop">{{ o["ramp_time"] }}</div>
-                    <div class="item prop">{{ o["runtime"] }}</div>
+                    <div class="item prop">{{ o["ramp_time"] }}/{{ o["runtime"] }}</div>
                     <div class="item prop">{{ t["storage_class"] }}</div>
                     <div class="item pg">{{ t["storage_class_stats"]["num_pg"] }}</div>
                     <div class="item prop">{{ o["ioengine"] }}</div>
                     <div class="item prop">{{ o["readwrite"] }} ({{ o["rwmixread"] }}/{{ 100 - (o["rwmixread"]|int) }})</div>
-                    <div class="item prop">{{ o["bs"] }}</div>
-                    <div class="item prop">{{ o["iodepth"] }}</div>
-                    <div class="item prop">{{ o["size"] }}</div>
+                    <div class="item prop">{{ o["bs"] }}/{{ o["iodepth"] }}/{{ o["size"] }}</div>
                 </div>
             </td>
             <td class="col_bench">
                 <div class="bench_run_group">
                     <div class="item bench">{{ t["read_bw_bytes"] | to_mb }}</div>
-                    <div class="item bench">{{ "%0.2f" | format(t["read_avg_lat_us"]|float) }}</div>
+                    <div class="item bench">{{ "%0.2f" | format(t["read_avg_lat_us"]|float) }} / {{ "%0.2f" | format(t["read_95p_clat_us"]|float) }}</div>
                     <div class="item bench">{{ "%0.2f" | format(t["read_iops"]|float) }}</div>
                     <div class="item bench">{{ t["write_bw_bytes"] | to_mb }}</div>
-                    <div class="item bench">{{ "%0.2f" | format(t["write_avg_lat_us"]|float) }}</div>
+                    <div class="item bench">{{ "%0.2f" | format(t["write_avg_lat_us"]|float) }} / {{ "%0.2f" | format(t["write_95p_clat_us"]|float) }}</div>
                     <div class="item bench">{{ "%0.2f" | format(t["write_iops"]|float) }}</div>
                 </div>
             </td>
@@ -600,24 +594,21 @@
                     <td class="status">{{ agent }}</td>
                     <td class="col_properties">
                         <div class="props_group">
-                            <div class="item prop">{{ j["job options"]["ramp_time"] }}</div>
-                            <div class="item prop">{{ j["job options"]["runtime"] }}</div>
+                            <div class="item prop">{{ j["job options"]["ramp_time"] }}/{{ j["job options"]["runtime"] }}</div>
                             <div class="item prop">{{ t["storage_class"] }}</div>
                             <div class="item pg">{{ t["storage_class_stats"]["num_pg"] }}</div>
                             <div class="item prop">{{ o["ioengine"] }}</div>
                             <div class="item prop">{{ o["readwrite"] }} ({{ o["rwmixread"] }}/{{ 100 - (o["rwmixread"]|int) }})</div>
-                            <div class="item prop">{{ j["job options"]["bs"] }}</div>
-                            <div class="item prop">{{ o["iodepth"] }}</div>
-                            <div class="item prop">{{ j["job options"]["size"] }}</div>
+                            <div class="item prop">{{ j["job options"]["bs"] }}/{{ o["iodepth"] }}/{{ j["job options"]["size"] }}</div>
                         </div>
                     </td>
                     <td class="col_bench">
                         <div class="bench_run_group">
                             <div class="item bench">{{ j["read"]["bw_bytes"] | to_mb }}</div>
-                            <div class="item bench">{{ "%0.2f" | format(j["read"]["lat_ns"]["mean"]|float / 1000) }}</div>
+                            <div class="item bench">{{ "%0.2f" | format(j["read"]["lat_ns"]["mean"]|float / 1000) }} / {{ "%0.2f" | format(j["read"]["clat_ns"]["percentile"]["95.000000"]|float / 1000) }}</div>
                             <div class="item bench">{{ "%0.2f" | format(j["read"]["iops"]|float) }}</div>
                             <div class="item bench">{{ j["write"]["bw_bytes"] | to_mb }}</div>
-                            <div class="item bench">{{ "%0.2f" | format(j["write"]["lat_ns"]["mean"]|float / 1000) }}</div>
+                            <div class="item bench">{{ "%0.2f" | format(j["write"]["lat_ns"]["mean"]|float / 1000) }} / {{ "%0.2f" | format(j["write"]["clat_ns"]["percentile"]["95.000000"]|float / 1000) }}</div>
                             <div class="item bench">{{ "%0.2f" | format(j["write"]["iops"]|float) }}</div>
                         </div>
                     </td>