diff --git a/stackviz/static/js/summary.js b/stackviz/static/js/summary.js
index 9eece6e..c361bb0 100644
--- a/stackviz/static/js/summary.js
+++ b/stackviz/static/js/summary.js
@@ -98,6 +98,8 @@ function createTables(entries) {
         d3.json(entry.url, function(error, data) {
             if (error) throw error;
             //create a table for the info
+            // TODO: entry now has provider description, etc which should be
+            // shown (categorized?)
             createTable(data, entry.run);
         });
     })
diff --git a/stackviz/templates/index.html b/stackviz/templates/index.html
index 453866f..c2d35b3 100644
--- a/stackviz/templates/index.html
+++ b/stackviz/templates/index.html
@@ -29,18 +29,25 @@
 </div>
 
 <script>
-var tempest_runs = '{{tempest_runs|join:","}}'.split(",");
-var urls = [];
-for (var run in tempest_runs) {
-    var url = "tempest_api_tree_" + run + ".json";
-    if ("{{use_gzip}}" === "True") {
-        url += ".gz";
-    }
-
-    urls.push({ url: url, run: run });
+var urlSuffix = "";
+if ("{{use_gzip}}" === "True") {
+    urlSuffix = ".gz";
 }
 
-window.addEventListener('load', createTables( urls ));
+var tempestRuns = [];
+
+/* {% for provider in tempest_providers %} begin generated */
+/* {% for index in provider.indexes %} */
+tempestRuns.push({
+    provider: "{{provider.name}}",
+    providerDescription: "{{provider.description}}",
+    run: parseInt("{{index}}"),
+    url: "tempest_api_tree_{{provider.name}}_{{index}}.json" + urlSuffix
+});
+/* {% endfor %} */
+/* {% endfor %} end generated */
+
+window.addEventListener('load', createTables( tempestRuns ));
 </script>
 
 {% endblock %}
diff --git a/stackviz/templates/tempest/results.html b/stackviz/templates/tempest/results.html
index e668946..de20f75 100644
--- a/stackviz/templates/tempest/results.html
+++ b/stackviz/templates/tempest/results.html
@@ -33,8 +33,11 @@
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu pull-right" role="menu">
-                            {% for run_id in tempest_runs %}
-                                <li><a href="tempest_results_{{run_id}}.html">Run #{{run_id}}</a></li>
+                            {% for provider in tempest_providers %}
+                                <li class="dropdown-header">{{ provider.description }}</li>
+                                {% for index in provider.indexes %}
+                                    <li><a href="tempest_timeline_{{ provider.name }}_{{ index }}.html">Run #{{ index }}</a></li>
+                                {% endfor %}
                             {% endfor %}
                         </ul>
                     </div>
@@ -76,7 +79,7 @@
 <script>
 window.addEventListener('load', function() {
     $("#details-dialog").hide();
-    var url = "tempest_api_tree_{{run_id}}.json";
+    var url = "tempest_api_tree_{{provider_name}}_{{run_id}}.json";
     if ("{{use_gzip}}" === "True") {
         url += ".gz";
     }
diff --git a/stackviz/templates/tempest/timeline.html b/stackviz/templates/tempest/timeline.html
index eeaabcb..eb38469 100644
--- a/stackviz/templates/tempest/timeline.html
+++ b/stackviz/templates/tempest/timeline.html
@@ -28,7 +28,7 @@
 </div>
 <div class="row">
     <div class="col-lg-12">
-        <h1 class="page-header">Tempest: Execution Timeline (run #{{run_id}})</h1>
+        <h1 class="page-header">Execution Timeline ({{provider_name}}, run #{{run_id}})</h1>
     </div>
 </div>