diff --git a/website/awfy.js b/website/awfy.js
index e1d63fc..cb327ca 100644
--- a/website/awfy.js
+++ b/website/awfy.js
@@ -134,12 +134,16 @@ AWFY.drawLegend = function () {
             continue;
         if (AWFY.machineId != 14 && modename == 16)
             continue;
+        if (!mode.used)
+            continue;
         modes.push(mode);
     }
 
     for (var i = 0; i < modes.length; i++) {
         var mode = modes[i];
         var vendor = AWFYMaster.vendors[mode.vendor_id];
+        if (!vendor)
+            continue;
         var item = $('<li style="border-color:' + mode.color + '"></li>');
         var link = $('<a href="#" style="text-decoration: none">' +
                      vendor.browser +
@@ -541,12 +545,15 @@ AWFY.requestRedraw = function () {
                    this.computeAggregate.bind(this));
     } else if (this.view == 'breakdown') {
         var suite = AWFYMaster.suites[this.suiteName];
+        var total = 0;
         for (var i = 0; i < suite.tests.length; i++) {
             var id = this.suiteName + '-' + suite.tests[i];
             var callback = (function (id) {
                 return (function (received) {
                     if (received[0])
                         this.computeBreakdown(received[0], id);
+                    if (++total == suite.tests.length)
+                        this.drawLegend();
                 }).bind(this);
             }).bind(this)(id);
             var file = 'bk-aggregate-' + id + '-' + this.machineId;
@@ -578,6 +585,9 @@ AWFY.reset = function (view) {
         }
     }
 
+    for (var mode in AWFYMaster.modes)
+        AWFYMaster.modes[mode].used = false;
+
     this.hasLegend = false;
     this.aggregate = { };
     this.view = view;
diff --git a/website/frontpage.js b/website/frontpage.js
index 682acab..a5bf766 100644
--- a/website/frontpage.js
+++ b/website/frontpage.js
@@ -187,11 +187,17 @@ Display.prototype.draw = function () {
     for (var i = 0; i < this.orig_graph.info.length; i++) {
         var info = this.orig_graph.info[i];
         var mode = AWFYMaster.modes[info.modeid];
-        if (!mode || mode.hidden)
+        if (!mode)
             continue;
+
         // Strip JM+TI, BC
         if (info.modeid == 12 || info.modeid == 15)
             continue;
+
+        mode.used = true;
+        if (mode.hidden)
+            continue;
+
         new_info.push(info);
         new_lines.push(this.orig_graph.lines[i]);
     }