diff --git a/Sources/SwiftMetricsDash/SwiftMetricsDash.swift b/Sources/SwiftMetricsDash/SwiftMetricsDash.swift
index f02d10c..619e1d5 100644
--- a/Sources/SwiftMetricsDash/SwiftMetricsDash.swift
+++ b/Sources/SwiftMetricsDash/SwiftMetricsDash.swift
@@ -69,7 +69,7 @@ public class SwiftMetricsDash {
 
     func startServer(router: Router) throws {
       router.all("/swiftmetrics-dash", middleware: StaticFileServer(path: self.SM.localSourceDirectory + "/public"))
-      
+
         if self.createServer {
             let configMgr = ConfigurationManager().load(.environmentVariables)
             Kitura.addHTTPServer(onPort: configMgr.port, with: router)
@@ -82,12 +82,23 @@ class SwiftMetricsService: WebSocketService {
 
     private var connections = [String: WebSocketConnection]()
     var httpAggregateData: HTTPAggregateData = HTTPAggregateData()
-    var httpURLData:[String:(totalTime:Double, numHits:Double)] = [:]
+    var httpURLData:[String:(totalTime:Double, numHits:Double, longestTime:Double)] = [:]
     let httpURLsQueue = DispatchQueue(label: "httpURLsQueue")
     let httpQueue = DispatchQueue(label: "httpStoreQueue")
     let jobsQueue = DispatchQueue(label: "jobsQueue")
     var monitor:SwiftMonitor
 
+    // CPU summary data
+    var totalProcessCPULoad: Double = 0.0;
+    var totalSystemCPULoad: Double = 0.0;
+    var cpuLoadSamples: Double = 0
+
+    // Memory summary data
+    var totalProcessMemory: Int = 0;
+    var totalSystemMemory: Int = 0;
+    var memorySamples: Int = 0;
+
+
 
     public init(monitor: SwiftMonitor) {
         self.monitor = monitor
@@ -100,7 +111,13 @@ class SwiftMetricsService: WebSocketService {
 
 
     func sendCPU(cpu: CPUData) {
-        let cpuLine = JSON(["topic":"cpu", "payload":["time":"\(cpu.timeOfSample)","process":"\(cpu.percentUsedByApplication)","system":"\(cpu.percentUsedBySystem)"]])
+        totalProcessCPULoad += Double(cpu.percentUsedByApplication);
+        totalSystemCPULoad += Double(cpu.percentUsedBySystem);
+        cpuLoadSamples += 1;
+        let processMean = (totalProcessCPULoad / cpuLoadSamples);
+        let systemMean = (totalSystemCPULoad / cpuLoadSamples);
+
+        let cpuLine = JSON(["topic":"cpu", "payload":["time":"\(cpu.timeOfSample)","process":"\(cpu.percentUsedByApplication)","system":"\(cpu.percentUsedBySystem)","processMean":"\(processMean)","systemMean":"\(systemMean)"]])
 
         for (_,connection) in connections {
             if let messageToSend = cpuLine.rawString() {
@@ -112,11 +129,18 @@ class SwiftMetricsService: WebSocketService {
 
 
     func sendMEM(mem: MemData) {
+        totalProcessMemory += mem.applicationRAMUsed;
+        totalSystemMemory += mem.totalRAMUsed;
+        memorySamples += 1;
+        let processMean = (totalProcessMemory / memorySamples);
+        let systemMean = (totalSystemMemory / memorySamples);
 
         let memLine = JSON(["topic":"memory","payload":[
                 "time":"\(mem.timeOfSample)",
                 "physical":"\(mem.applicationRAMUsed)",
-                "physical_used":"\(mem.totalRAMUsed)"
+                "physical_used":"\(mem.totalRAMUsed)",
+                "processMean":"\(processMean)",
+                "systemMean":"\(systemMean)"
                 ]])
 
         for (_,connection) in connections {
@@ -219,10 +243,14 @@ class SwiftMetricsService: WebSocketService {
             if(urlTuple != nil) {
                 let averageResponseTime = urlTuple!.0
                 let hits = urlTuple!.1
+                var longest = urlTuple!.2
+                if (localmyhttp.duration > longest) {
+                    longest = localmyhttp.duration
+                }
                 // Recalculate the average
-                self.httpURLData.updateValue(((averageResponseTime * hits + localmyhttp.duration)/(hits + 1), hits + 1), forKey: localmyhttp.url)
+                self.httpURLData.updateValue(((averageResponseTime * hits + localmyhttp.duration)/(hits + 1), hits + 1, longest), forKey: localmyhttp.url)
             } else {
-                self.httpURLData.updateValue((localmyhttp.duration, 1), forKey: localmyhttp.url)
+                self.httpURLData.updateValue((localmyhttp.duration, 1, localmyhttp.duration), forKey: localmyhttp.url)
             }
         }
     }
@@ -251,7 +279,7 @@ class SwiftMetricsService: WebSocketService {
             var responseData:[JSON] = []
             let localCopy = self.httpURLData
             for (key, value) in localCopy {
-                let json = JSON(["url":key, "averageResponseTime": value.0])
+                let json = JSON(["url":key, "averageResponseTime": value.0, "hits": value.1, "longestResponseTime": value.2])
                     responseData.append(json)
             }
             var messageToSend:String=""
diff --git a/public/graphmetrics b/public/graphmetrics
index fa44723..5cbd2f6 160000
--- a/public/graphmetrics
+++ b/public/graphmetrics
@@ -1 +1 @@
-Subproject commit fa44723a1e0179ee5364ef4f9ab6ed571ce62aeb
+Subproject commit 5cbd2f6ad0d46f548e223d36eef7ef1e3d6b1a4d
diff --git a/public/index.html b/public/index.html
index 7c4ef7a..9447579 100755
--- a/public/index.html
+++ b/public/index.html
@@ -34,21 +34,47 @@
 
     <div class="headerDiv"><span class="rightHeader"></span><span class="leftHeader"></span></div>
 
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-md-6 hideable" id="httpDiv1"></div>
-            <div class="col-md-3 hideable" id="httpDiv2"></div>
-            <div class="col-md-3 hideable" id="httpDiv3"></div>
+    <div id="tabs" class="container">
+
+      <ul class="nav nav-tabs">
+        <li class="active">
+          <a href="#dashboard" id="dashboard-tab" data-toggle="tab">Dashboard</a>
+        </li>
+        <li>
+          <a href="#summary" id="summary-tab" data-toggle="tab">Summary</a>
+        </li>
+      </ul>
+
+      <div class="tab-content ">
+        <div class="tab-pane active" id="dashboard">
+          <div class="container-fluid">
+          <div class="row">
+              <div class="col-md-6 hideable" id="cpuDiv1"></div>
+              <div class="col-md-6 hideable" id="httpDiv1"></div>
+          </div>
+          <div class="row">
+            <div class="col-md-6 hideable" id="memDiv1"></div>
+            <div class="col-md-6 hideable" id="httpDiv2"></div>
+          </div>
+          </div>
         </div>
 
-        <div class="row">
-            <div class="col-md-4 hideable" id="cpuDiv1"></div>
-            <div class="col-md-4 hideable" id="memDiv1"></div>
-            <div class="col-md-4 hideable" id="envDiv"></div>
+        <div class="tab-pane" id="summary">
+          <div class="container-fluid">
+            <div class="row">
+              <div class="graph-container col-md-7">
+                <div class="col-md-12 height-fill hideable" id="httpSummaryDiv"></div>
+              </div>
+              <div class="graph-container col-md-5">
+                <div class="col-md-12 hideable" id="envDiv"></div>
+                <div class="col-md-12 hideable" id="summaryDiv"></div>
+              </div>
+            </div>
+          </div>
         </div>
+      </div>
     </div>
 
-
 <script type="text/javascript" src="graphmetrics/js/i18n.js"></script>
 <script>
     // Global variables
@@ -90,11 +116,12 @@
 
  </script>
 <script type="text/javascript" src="graphmetrics/js/header.js"></script>
-<script type="text/javascript" src="graphmetrics/js/envTable.js"></script>
+<script type="text/javascript" src="graphmetrics/js/textTable.js"></script>
 <script type="text/javascript" src="graphmetrics/js/cpuChart.js"></script>
 <script type="text/javascript" src="graphmetrics/js/httpThroughPutChart.js"></script>
 <script type="text/javascript" src="graphmetrics/js/httpRequestsChart.js"></script>
-<script type="text/javascript" src="graphmetrics/js/httpTop5.js"></script>
+<script type="text/javascript" src="graphmetrics/js/httpSummary.js"></script>
+<script type="text/javascript" src="graphmetrics/js/top5.js"></script>
 <script type="text/javascript" src="graphmetrics/js/memChart.js"></script>
 <script>
     let hostname = location.host;
@@ -107,8 +134,12 @@
       webSocketProtocol = "wss://"
     }
     var client = new WebSocket(webSocketProtocol + hostname + dashboardRoot,"swiftmetrics-dash")
+    let summary = {cpu:{}, gc:{}, memory:{}};
 
-    setHttpTop5Options({host: hostname, filteredPath: location.origin + dashboardRoot});
+    let envTable = new TextTable('#envDiv', '#summary', localizedStrings.envTitle);
+    let summaryTable = new TextTable('#summaryDiv', '#summary', localizedStrings.summaryTitle);
+    let httpSummary = new HttpSummary('#httpSummaryDiv', '#summary', localizedStrings.httpSummaryTitle);
+    httpSummary.setHttpSummaryOptions({host: hostname, filteredPath: location.origin + dashboardRoot});
 
     client.onmessage = function(message) {
         received = JSON.parse(message.data);
@@ -118,39 +149,72 @@
         switch (topic) {
             case 'cpu':
                 updateCPUData(payload);
+                summary.cpu.systemMean = received.payload.systemMean;
+                summary.cpu.processMean = received.payload.processMean;
                 break;
             case 'memory':
                 updateMemData(payload);
+                summary.memory.systemMean = received.payload.systemMean;
+                summary.memory.processMean = received.payload.processMean;
                 break;
             case 'env':
-                populateEnvTable(payload);
+                envTable.populateTableJSON(payload);
                 break;
             case 'http':
                 updateHttpData(payload);
                 break;
             case 'httpURLs':
-                updateURLData(payload);
+                httpSummary.updateURLData(payload);
                 break;
             case 'title' :
                 updateHeader(payload);
                 break;
 
         }
+        let summaryData = [];
+        if( summary.cpu.processMean ) {
+           let value = new Number(summary.cpu.processMean);
+           let valueStr = value.toLocaleString([],{style: 'percent', minimumSignificantDigits: 4, maximumSignificantDigits: 4});
+           summaryData.push({Parameter: 'Average Process CPU', Value: valueStr});
+        }
+        if( summary.cpu.systemMean ) {
+            let value = new Number(summary.cpu.systemMean);
+            let valueStr = value.toLocaleString([],{style: 'percent', minimumSignificantDigits: 4, maximumSignificantDigits: 4});
+            summaryData.push({Parameter: 'Average System CPU', Value: valueStr});
+         }
+         if( summary.memory.processMean ) {
+            summaryData.push({Parameter: 'Average Process Memory', Value: `${summary.memory.processMean} bytes`});
+         }
+         if( summary.memory.systemMean ) {
+            summaryData.push({Parameter: 'Average System Memory', Value: `${summary.memory.systemMean} bytes`});
+         }
+        summaryTable.populateTable(summaryData);
     }
 
+    let selected_tab = "dashboard-tab"
     window.addEventListener('resize', resize);
+    // Also re-size when we change tabs in case we re-sized
+    // while the new tab wasn't visible.
+    $('.nav-tabs a').on('shown.bs.tab', function(event) {
+      selected_tab = event.target.id;
+      resize();
+    });
 
     function resize() {
-        canvasWidth = $("#cpuDiv1").width() - 8,
-        httpCanvasWidth = $("#httpDiv1").width() - 8,
-        graphWidth = canvasWidth - margin.left - margin.right,
-        httpGraphWidth = httpCanvasWidth - margin.left - margin.right;
-        resizeCPUChart();
-        resizeHttpChart();
-        resizeHttpThroughputChart();
-        resizeHttpTop5Chart();
-        resizeMemChart();
-        resizeEnvTable();
+        if (selected_tab == "dashboard-tab") {
+          canvasWidth = $("#cpuDiv1").width() - 8,
+          httpCanvasWidth = $("#httpDiv1").width() - 8,
+          graphWidth = canvasWidth - margin.left - margin.right,
+          httpGraphWidth = httpCanvasWidth - margin.left - margin.right;
+          resizeCPUChart();
+          resizeHttpChart();
+          resizeHttpThroughputChart();
+          resizeMemChart();
+      } else if(selected_tab == "summary-tab") {
+          envTable.resizeTable();
+          summaryTable.resizeTable();
+          httpSummary.resizeTable();
+      }
     }
 
 </script>