diff --git a/app.js b/app.js
index c8f0665..ddcd720 100644
--- a/app.js
+++ b/app.js
@@ -168,6 +168,8 @@ function startServices() {
 	});
 }
 
+logger.log('info', 'Booting, please wait...');
+
 if (config.logToDatabase) {
 	// Setup our database.
 	db.setup();
diff --git a/assets/css/main.css b/assets/css/main.css
index 3b14f66..ae3fa79 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -186,4 +186,8 @@ h3 {
 
 #big-graph {
     height: 500px;
+}
+
+#big-graph-controls > table {
+    width: 100%;
 }
\ No newline at end of file
diff --git a/assets/js/site.js b/assets/js/site.js
index 3445ee7..b1307d1 100644
--- a/assets/js/site.js
+++ b/assets/js/site.js
@@ -218,6 +218,7 @@ $(document).ready(function() {
         $('#server-container').html('');
         $('#quick-jump-container').html('');
         $('#big-graph').html('');
+        $('#big-graph-controls').html('');
     });
 
     socket.on('historyGraph', function(rawData) {
@@ -229,9 +230,24 @@ $(document).ready(function() {
 
         var keys = Object.keys(rawData);
 
+        var sinceBreak = 0;
+        var html = '<table><tr>';
+
+        keys.sort();
+
         for (var i = 0; i < keys.length; i++) {
-            $('#big-graph-controls').append('<input type="checkbox" class="graph-control" id="graph-controls" data-target-network="' + keys[i] + '" checked=checked> ' + keys[i] + '</input> ');
+            html += '<td><input type="checkbox" class="graph-control" id="graph-controls" data-target-network="' + keys[i] + '" checked=checked> ' + keys[i] + '</input></td>';
+
+            if (sinceBreak >= 3) {
+                sinceBreak = 0;
+
+                html += '</tr><tr>';
+            } else {
+                sinceBreak++;
+            }
         }
+
+        $('#big-graph-controls').append(html + '</tr></table>');
     });
 
     socket.on('updateHistoryGraph', function(rawData) {
diff --git a/lib/util.js b/lib/util.js
index f9b96fd..e730e60 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -57,7 +57,7 @@ function trimUselessPings(data) {
 
 	// Delete data for any networks we don't care about anymore.
 	for (var i = 0; i < keysToRemove.length; i++) {
-		delete data[entry];
+		delete data[keysToRemove[i]];
 	}
 }