diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/TestPlan.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/TestPlan.pm
index be2631aa479..62305a27261 100644
--- a/mozilla/webtools/testopia/Bugzilla/Testopia/TestPlan.pm
+++ b/mozilla/webtools/testopia/Bugzilla/Testopia/TestPlan.pm
@@ -51,6 +51,7 @@ use Bugzilla::Testopia::TestCase;
 use Bugzilla::Testopia::Category;
 use Bugzilla::Testopia::Build;
 use Bugzilla::Testopia::TestTag;
+use Bugzilla::Bug;
 
 #TODO: Add this to checksetup
 use Text::Diff;
diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/TestRun.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/TestRun.pm
index af063b97d10..ba93de1afed 100644
--- a/mozilla/webtools/testopia/Bugzilla/Testopia/TestRun.pm
+++ b/mozilla/webtools/testopia/Bugzilla/Testopia/TestRun.pm
@@ -48,6 +48,7 @@ use Bugzilla::User;
 use Bugzilla::Constants;
 use Bugzilla::Config;
 use Bugzilla::Testopia::Environment;
+use Bugzilla::Bug;
 
 use base qw(Exporter);
 @Bugzilla::Testopia::TestRun::EXPORT = qw(CalculatePercentCompleted);
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/caserun/short-form-header.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/caserun/short-form-header.html.tmpl
index 8a86aa7dfdd..28a834ce252 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/caserun/short-form-header.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/caserun/short-form-header.html.tmpl
@@ -26,7 +26,7 @@
         <tr>
       [% IF !caserun.canedit %]
           <td valign="middle" style="cursor:pointer;" onclick="sr([% index %]);">
-            <img src="testopia/img/lk.gif" width="13" height="15" alt="locked" border="0"/>
+            <img src="testopia/img/lk.gif" width="13" height="15" alt="locked" title="Locked: This run is stopped" border="0"/>
           </td>
       [% END %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl
index db3ed81895e..ca40edb14d3 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl
@@ -37,25 +37,25 @@
 [% PROCESS global/header.html.tmpl %]
 
 [% PROCESS testopia/style.none.tmpl %]
-
+<h3>Summary of all runs</h3>
 <table border="0">
   <tr>  
     <td>&nbsp;</td>
-[% FOREACH b = report.builds %]
-    <td><img src=tr_draw.cgi?text=[% b.value %]"/></td>
+[% FOREACH b = report.build_ids %]
+    <td><img src="tr_draw.cgi?text=[% report.builds.$b FILTER url_quote %]"></td>
 [% END %]
   </tr>
 [% FOREACH case = report.keys %]
-  [% IF case == 'builds' %]
+  [% IF case == 'builds' OR case == 'build_ids' %]
     [% NEXT %]
   [% END %]
-  <tr>
-    <td><a href="tr_show_case.cgi?case_id=[% case %]">[% case %]</a></td>
+  <tr class="[% loop.count % 2 == 0 ? "bz_row_odd" : "bz_row_even" %]">
+    <td align="right"><a href="tr_show_case.cgi?case_id=[% case %]">[% report.$case.name %]</a></td>
   [% FOREACH bid = report.builds.keys %]
-    <td align="center">
+    <td align="left">
     [% IF report.$case.$bid.status %]
       <a href="tr_show_caserun.cgi?caserun_id=[% report.$case.$bid.id %]">
-      <img src="testopia/img/[% report.$case.$bid.status %]_small.gif" alt="[% report.$case.$bid.status %]" border="0" />
+      <img src="testopia/img/[% report.$case.$bid.status %]_small.gif" alt="[% report.$case.$bid.status %]" title="[% report.$case.$bid.status %]" border="0" />
     [% ELSE %]
       &nbsp;
     [% END %]
@@ -64,6 +64,39 @@
   </tr>
 [% END %]
 </table>
+
+<br><br>
+<h3>Individual Runs</h3>
+[% FOREACH run = run_reports.keys %]
+  <span style="font-size:10pt; font-weight:bold"><a href="tr_show_run.cgi?run_id=[% run %]">Test Run [% run %]: [% run_reports.$run.name %]</a></span>
+  <table border="0">
+    <tr>  
+      <td>&nbsp;</td>
+  [% FOREACH rb = report.build_ids %]
+      <td><img src="tr_draw.cgi?text=[% report.builds.$rb FILTER url_quote %]"></td>
+  [% END %]
+    </tr>
+  [% FOREACH case = run_reports.$run.keys %]
+    [% IF case == 'name' %]
+      [% NEXT %]
+    [% END %]
+    <tr class="[% loop.count % 2 == 0 ? "bz_row_odd" : "bz_row_even" %]">
+      <td align="right"><a href="tr_show_case.cgi?case_id=[% case %]">[% run_reports.$run.$case.name %]</a></td>
+    [% FOREACH bid = report.builds.keys %]
+      <td align="left">
+      [% IF run_reports.$run.$case.$bid.status %]
+        <a href="tr_show_caserun.cgi?caserun_id=[% report.$case.$bid.id %]">
+        <img src="testopia/img/[% run_reports.$run.$case.$bid.status %]_small.gif" alt="[% run_reports.$run.$case.$bid.status %]" title="[% run_reports.$run.$case.$bid.status %]" border="0" />
+      [% ELSE %]
+        &nbsp;
+      [% END %]
+      </td>
+    [% END %]
+    </tr>
+  [% END %]
+  </table>
+<br><br>
+[% END %]
 <p>
 Back to <a href="tr_show_plan.cgi?plan_id=[% plan.id FILTER none %]">plan</a>
 </p>
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/text.png.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/text.png.tmpl
index d6ab78ee32a..16afab31158 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/text.png.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/text.png.tmpl
@@ -1,5 +1,5 @@
     [% FILTER null;
-        USE gd  = GD.Image(200,40);
+        USE gd  = GD.Image(100,40);
         USE gdc = GD.Constants;
         white = gd.colorAllocate(255,255, 255);
         black = gd.colorAllocate(0,0,0);
@@ -9,7 +9,7 @@
          text        => txt,
         );
         wrapbox.set_font(gdc.gdMediumBoldFont);
-        wrapbox.set(align => 'left', width => 200);
+        wrapbox.set(align => 'left', width => 100);
         wrapbox.draw(2, 2);
         gdr = gd.copyRotate270();
         gdr.png | stdout(1);
diff --git a/mozilla/webtools/testopia/tr_plan_reports.cgi b/mozilla/webtools/testopia/tr_plan_reports.cgi
index facf530df3d..d0b341b9a9a 100755
--- a/mozilla/webtools/testopia/tr_plan_reports.cgi
+++ b/mozilla/webtools/testopia/tr_plan_reports.cgi
@@ -58,17 +58,29 @@ if ($type eq 'build_coverage'){
             $buildseen{$cr->build->id} = $cr->build->name;
             $report->{$case->id}->{$cr->build->id} = $cr;
         }
+        $report->{$case->id}->{'name'} = $case->summary;
     }
-       
+    my $run_reports = {};
+    foreach my $run (@{$plan->test_runs}){
+        foreach my $cr (@{$run->caseruns}){
+            $run_reports->{$run->id}->{$cr->case->id}->{$cr->build->id} = $cr;
+            $run_reports->{$run->id}->{$cr->case->id}->{'name'} = $cr->case->summary; 
+        }
+        
+        $run_reports->{$run->id}->{'name'} = $run->summary;
+    }
+    my @ids = keys %buildseen;
+    $report->{'build_ids'} = \@ids;
     $report->{'builds'} = \%buildseen;
+    $vars->{'run_reports'} = $run_reports;
     $vars->{'report'} = $report;
     $vars->{'plan'} = $plan;
 
     print $cgi->header();
     if ($cgi->param('debug')){
-        use Data::Dumper;
-        print Dumper(\%buildseen);
+        use Data::Dumper;        
         print Dumper($report);
+        print Dumper($run_reports);
     }
     $template->process("testopia/reports/build-coverage.html.tmpl", $vars)
        || ThrowTemplateError($template->error());