diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm
index 5cf168a38a0..91cb2237a10 100644
--- a/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm
+++ b/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm
@@ -389,6 +389,10 @@ sub init {
         push @supptables, "INNER JOIN test_case_plans AS case_plans ON test_cases.case_id = case_plans.case_id";
         push @orderby, 'case_plans.plan_id';
     }
+    elsif($order eq 'requirement' && $obj eq 'case_run'){
+        push @supptables, "INNER JOIN test_cases ON test_cases.case_id = test_case_runs.case_id";
+        push @orderby, 'test_cases.requirement';
+    }
     elsif ($order eq 'priority') {
         if ($obj eq 'case_run'){
             push @supptables, "INNER JOIN test_cases ON test_cases.case_id = test_case_runs.case_id";
diff --git a/mozilla/webtools/testopia/extensions/testopia/code/post_bug-after_creation.pl b/mozilla/webtools/testopia/extensions/testopia/code/post_bug-after_creation.pl
index 19fce47fb3e..6b11e052f46 100644
--- a/mozilla/webtools/testopia/extensions/testopia/code/post_bug-after_creation.pl
+++ b/mozilla/webtools/testopia/extensions/testopia/code/post_bug-after_creation.pl
@@ -6,16 +6,20 @@ use Bugzilla::Testopia::TestCase;
 my $vars = Bugzilla->hook_args->{vars};
 my $cgi = Bugzilla->cgi;
 
-if ($cgi->param('case_id')) {
+my $caserun_id = $cgi->param('caserun_id');
+my $case_id = $cgi->param('case_id'); 
+if (detaint_natural($case_id)) {
     my $case = Bugzilla::Testopia::TestCase->new($cgi->param('case_id'));
+    ThrowUserError("invalid-test-id-non-existent", {'id' => $case_id, 'type' => 'Case'}) unless $case;
     ThrowUserError("testopia-read-only", {'object' => $case}) unless $case->canedit;
     
     $case->attach_bug($vars->{'id'});
 
     $vars->{'case'} = $case;
 }
-if ($cgi->param('caserun_id')) {
+if (detaint_natural($caserun_id)) {
     my $caserun = Bugzilla::Testopia::TestCaseRun->new($cgi->param('caserun_id'));
+    ThrowUserError("invalid-test-id-non-existent", {'id' => $caserun_id, 'type' => 'Case-Run'}) unless $caserun;
     ThrowUserError("testopia-read-only", {'object' => $caserun}) unless $caserun->canedit;
     
     $caserun->attach_bug($vars->{'id'});
diff --git a/mozilla/webtools/testopia/template/en/default/hook/global/common-links.html.tmpl/links/testopia.html.tmpl b/mozilla/webtools/testopia/template/en/default/hook/global/common-links.html.tmpl/links/testopia.html.tmpl
index 88d0b57186b..2c17d7c1539 100644
--- a/mozilla/webtools/testopia/template/en/default/hook/global/common-links.html.tmpl/links/testopia.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/hook/global/common-links.html.tmpl/links/testopia.html.tmpl
@@ -41,10 +41,10 @@
   <li class="tr_saved_search">
   <select class="dropdown" onchange="if (this.selectedIndex != 0) {document.location=this.value}">
     <option>--Testopia--</option>
-    <option value="tr_list_runs.cgi?current_tab=run&run_status=0">Current Runs</a></option>
-    <option value="tr_list_plans.cgi?current_tab=plan&name_type=allwordssubstr&name=&plan_text_type=allwordssubstr&plan_text=&tag_type=allwords&tags=&author_type=exact&author=[% user.login FILTER url_quote %]&plan_id=">My Plans</a></option>
-    <option value="tr_list_cases.cgi?current_tab=case&summary_type=allwordssubstr&summary=&tcaction_type=allwordssubstr&tcaction=&tceffect_type=allwordssubstr&tceffect=&script_type=allwordssubstr&script=&requirement_type=allwordssubstr&requirement=&tag_type=allwords&tags=&author_type=exact&author=&default_tester_type=substring&default_tester=[% user.login FILTER url_quote %]&case_id=&plan_id=">My Cases</a></option>
-    <option value="tr_list_runs.cgi?current_tab=run&summary_type=allwordssubstr&summary=&notes_type=allwordssubstr&notes=&environment_type=allwordssubstr&environment=&tag_type=allwords&tag=&manager_type=substring&manager=[% user.login FILTER url_quote %]&run_id=&plan_id=&assignee_type=substr&assignee=[% user.login FILTER url_quote %]">My Runs</a></option>
+    <option value="tr_list_runs.cgi?current_tab=run&run_status=0&distinct=1">Current Runs</a></option>
+    <option value="tr_list_plans.cgi?current_tab=plan&name_type=allwordssubstr&name=&plan_text_type=allwordssubstr&plan_text=&tag_type=allwords&tags=&author_type=exact&author=[% user.login FILTER url_quote %]&plan_id=&distinct=1">My Plans</a></option>
+    <option value="tr_list_cases.cgi?current_tab=case&summary_type=allwordssubstr&summary=&tcaction_type=allwordssubstr&tcaction=&tceffect_type=allwordssubstr&tceffect=&script_type=allwordssubstr&script=&requirement_type=allwordssubstr&requirement=&tag_type=allwords&tags=&author_type=exact&author=&default_tester_type=substring&default_tester=[% user.login FILTER url_quote %]&case_id=&plan_id=&distinct=1">My Cases</a></option>
+    <option value="tr_list_runs.cgi?current_tab=run&summary_type=allwordssubstr&summary=&notes_type=allwordssubstr&notes=&environment_type=allwordssubstr&environment=&tag_type=allwords&tag=&manager_type=substring&manager=[% user.login FILTER url_quote %]&run_id=&plan_id=&assignee_type=substr&assignee=[% user.login FILTER url_quote %]&distinct=1">My Runs</a></option>
   [% FOREACH q = user.testopia_queries %]
     <option value="[% q.query %]">[% q.name FILTER html %]</option>
   [% END %]        
diff --git a/mozilla/webtools/testopia/template/en/default/hook/global/useful-links.html.tmpl/end/tr.html.tmpl b/mozilla/webtools/testopia/template/en/default/hook/global/useful-links.html.tmpl/end/tr.html.tmpl
index 2681b1934a5..51156c42f9f 100644
--- a/mozilla/webtools/testopia/template/en/default/hook/global/useful-links.html.tmpl/end/tr.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/hook/global/useful-links.html.tmpl/end/tr.html.tmpl
@@ -24,10 +24,10 @@
     Testopia Saved Searches:
   </div>
   <ul class="links">
-    <li><a href="tr_list_runs.cgi?current_tab=run&run_status=0">Current Runs</a></li>
-    <li><span class="separator">| </span><a href="tr_list_plans.cgi?current_tab=plan&name_type=allwordssubstr&name=&plan_text_type=allwordssubstr&plan_text=&tag_type=allwords&tags=&author_type=exact&author=[% user.login FILTER url_quote %]&plan_id=">My Plans</a></li>
-    <li><span class="separator">| </span><a href="tr_list_cases.cgi?current_tab=case&summary_type=allwordssubstr&summary=&tcaction_type=allwordssubstr&tcaction=&tceffect_type=allwordssubstr&tceffect=&script_type=allwordssubstr&script=&requirement_type=allwordssubstr&requirement=&tag_type=allwords&tags=&author_type=exact&author=&default_tester_type=substring&default_tester=[% user.login FILTER url_quote %]&case_id=&plan_id=">My Cases</a></li>
-    <li><span class="separator">| </span><a href="tr_list_runs.cgi?current_tab=run&summary_type=allwordssubstr&summary=&notes_type=allwordssubstr&notes=&environment_type=allwordssubstr&environment=&tag_type=allwords&tag=&manager_type=substring&manager=[% user.login FILTER url_quote %]&run_id=&plan_id=&assignee_type=substr&assignee=[% user.login FILTER url_quote %]">My Runs</a></li>
+    <li><a href="tr_list_runs.cgi?current_tab=run&run_status=0&distinct=1">Current Runs</a></li>
+    <li><span class="separator">| </span><a href="tr_list_plans.cgi?current_tab=plan&name_type=allwordssubstr&name=&plan_text_type=allwordssubstr&plan_text=&tag_type=allwords&tags=&author_type=exact&author=[% user.login FILTER url_quote %]&plan_id=&distinct=1">My Plans</a></li>
+    <li><span class="separator">| </span><a href="tr_list_cases.cgi?current_tab=case&summary_type=allwordssubstr&summary=&tcaction_type=allwordssubstr&tcaction=&tceffect_type=allwordssubstr&tceffect=&script_type=allwordssubstr&script=&requirement_type=allwordssubstr&requirement=&tag_type=allwords&tags=&author_type=exact&author=&default_tester_type=substring&default_tester=[% user.login FILTER url_quote %]&case_id=&plan_id=&distinct=1">My Cases</a></li>
+    <li><span class="separator">| </span><a href="tr_list_runs.cgi?current_tab=run&summary_type=allwordssubstr&summary=&notes_type=allwordssubstr&notes=&environment_type=allwordssubstr&environment=&tag_type=allwords&tag=&manager_type=substring&manager=[% user.login FILTER url_quote %]&run_id=&plan_id=&assignee_type=substr&assignee=[% user.login FILTER url_quote %]&distinct=1">My Runs</a></li>
   [% FOREACH query = user.testopia_queries %]
     <li><span class="separator">| </span><a href="[% query.query %]">[% query.name FILTER html %]</a></li>
   [% END %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/add.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/add.html.tmpl
index 7b843298483..0962aa727cb 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/add.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/add.html.tmpl
@@ -19,7 +19,7 @@
   #%]
   
   [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
     title = "Add a New Test Plan Type"
   %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/delete.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/delete.html.tmpl
index c93c2b1b3c8..80bab3a8779 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/delete.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/delete.html.tmpl
@@ -19,6 +19,6 @@
   #%]
   
   [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
     title = "Test Plan Types"
   %]
\ No newline at end of file
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/edit.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/edit.html.tmpl
index 7ebcf1e5136..464a5d9f2a1 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/edit.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/edit.html.tmpl
@@ -19,7 +19,7 @@
   #%]
   
   [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
     title = "Edit Test Plan Types"
   %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/show.html.tmpl
index 1fbbbb61ad5..8e79af9e53e 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/show.html.tmpl
@@ -19,7 +19,7 @@
   #%]
   
   [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
     title = "Test Plan Types"
   %]
   
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/show.html.tmpl
index 2cd2bcb4da7..179a2c3eeb1 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/show.html.tmpl
@@ -36,7 +36,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] %]
+    %]
 
 [% PROCESS testopia/style.none.tmpl %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/attachment/choose.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/attachment/choose.html.tmpl
index f966da73f3a..4e7bab122ed 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/attachment/choose.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/attachment/choose.html.tmpl
@@ -23,7 +23,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
    title = "Search by Attachment Number"
  %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/choose.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/choose.html.tmpl
index c6ee543d797..6e23b61cb4f 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/choose.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/choose.html.tmpl
@@ -23,7 +23,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
    title = "Search by Test Case Number"
  %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/list.html.tmpl
index 51cc0dee3a0..84438bd4931 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/list.html.tmpl
@@ -28,6 +28,7 @@
 [% PROCESS testopia/style.none.tmpl %]
 
 [% javascript_urls.push("testopia/js/case.js") %]
+[% javascript_urls.push("testopia/js/plan.js") %]
 [% javascript_urls.push("testopia/js/tags.js") %]
 [% javascript_urls.push("testopia/js/caserun.js") %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/add.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/add.html.tmpl
index f6ded8069a3..2fc1ee347d2 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/add.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/add.html.tmpl
@@ -34,7 +34,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] %]
+    %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/show.html.tmpl
index d930e2af58a..f4bd4bda27c 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/show.html.tmpl
@@ -35,7 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] %]
+    %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/choose.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/choose.html.tmpl
index 70851ab5d28..cda27928daa 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/choose.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/choose.html.tmpl
@@ -23,7 +23,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
    title = "Search by Test Run Environment Number"
  %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/delete.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/delete.html.tmpl
index d84c8098125..fa1c7525ffc 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/delete.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/delete.html.tmpl
@@ -34,7 +34,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] %]
+    %]
 
 [% IF deleted %]
 Environment Deleted
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/export.xml.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/export.xml.tmpl
index 1e91908717e..26bd116d1b3 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/export.xml.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/export.xml.tmpl
@@ -34,7 +34,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] %]
+    %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/import.xml.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/import.xml.tmpl
index a862412831b..44bb8f59355 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/import.xml.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/import.xml.tmpl
@@ -34,7 +34,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] %]
+    %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/list.html.tmpl
index b2b492ed999..c26fd9a3e90 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/list.html.tmpl
@@ -35,7 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] %]
+    %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/quicksearch.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/quicksearch.html.tmpl
index 12eec755fcb..4a4fdd74f10 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/quicksearch.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/quicksearch.html.tmpl
@@ -19,7 +19,7 @@
   #%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] %]
+    %]
 
 <form action="tr_quicksearch.cgi"><b>Testopia Quick Search:</b> <input
   name="query"> <input type="submit"></form>
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl
index 387b9e0c45d..23511cae202 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl
@@ -24,7 +24,7 @@
   
 [% title = "Bug Impact Report for Plan $plan.id - $plan.name" %]
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] %]
+    %]
 
 <p>This report details the bugs detected in this test plan and the number of test cases that each bug is attached to.
 Those bugs impacting the most test cases appear at the top. 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl
index f63f3e34e2d..f12acdbfe82 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl
@@ -35,7 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
   title = title
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl
index e59305f21d1..d579f8621dc 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl
@@ -35,7 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
   title = title
   style = style
 %]
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 87f3ed0d810..a84e9ef3a1f 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
@@ -35,7 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] %]
+    %]
 
 [% PROCESS testopia/style.none.tmpl %]
 <h3>Summary of all runs</h3>
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl
index d857c718ef5..037007689f8 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl
@@ -35,7 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
   title = title
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl
index c7f02a6ce1d..e870fc1bb99 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl
@@ -23,7 +23,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css']
+   
    title = "Search by Test Run Number"
  %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl
index 0e1baac4a5f..230500e4233 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl
@@ -20,7 +20,7 @@
   
 
 [% PROCESS global/header.html.tmpl
-   style_urls = ['testopia.css'] 
+    
    title = "Tags" %]
 [% PROCESS testopia/messages.html.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/testopia/js/case.js b/mozilla/webtools/testopia/testopia/js/case.js
index 93fe895e954..53cd503de75 100644
--- a/mozilla/webtools/testopia/testopia/js/case.js
+++ b/mozilla/webtools/testopia/testopia/js/case.js
@@ -902,10 +902,16 @@ NewCaseForm = function(plan_ids, product_id, run_id){
             }
         },{
             text: 'Cancel',
+            id: 'ncf_cancel_btn',
             handler: function(){
                 Ext.getCmp('newcaseform').getForm().reset();
                 try {
-                    Ext.getCmp('newcase-win').close();
+                    if (Ext.getCmp('newcase-win')) {
+                        Ext.getCmp('newcase-win').close();
+                    }
+                    else{
+                        window.location = 'tr_show_product.cgi';
+                    }
                 }
                 catch (err){}
             }
@@ -1205,7 +1211,12 @@ CaseClonePanel = function(product_id, cases){
         },{
             text: 'Cancel',
             handler: function(){
-                Ext.getCmp('case-clone-win').close();
+                try {
+                    Ext.getCmp('case-clone-win').close();
+                }
+                catch (err){
+                    window.location = 'tr_show_product.cgi';
+                }
             }
         }]
     });
diff --git a/mozilla/webtools/testopia/testopia/js/caserun.js b/mozilla/webtools/testopia/testopia/js/caserun.js
index a8f7c1696df..6045446b1bc 100755
--- a/mozilla/webtools/testopia/testopia/js/caserun.js
+++ b/mozilla/webtools/testopia/testopia/js/caserun.js
@@ -125,6 +125,7 @@ CaseRunFilter = function (){
                 var ds = Ext.getCmp('caserun_grid').store;
                 ds.baseParams = searchform.getValues();
                 ds.baseParams.limit = Ext.getCmp('testopia_pager').pageSize;
+                ds.baseParams.distinct = 1;
                 ds.load({
                     callback: function(){
                         Ext.getCmp('filtered_txt').show();
diff --git a/mozilla/webtools/testopia/testopia/js/run.js b/mozilla/webtools/testopia/testopia/js/run.js
index 49b1b5f29b0..8f892790c81 100644
--- a/mozilla/webtools/testopia/testopia/js/run.js
+++ b/mozilla/webtools/testopia/testopia/js/run.js
@@ -655,10 +655,6 @@ var NewRunForm = function(plan){
                         if (Ext.getCmp('plan_run_grid')){
                             Ext.getCmp('plan_run_grid').store.reload();
                         }
-                        try {
-                            Ext.getCmp('newRun-win').close();
-                        }
-                        catch (err){}
                     },
                     failure: testopiaError
                 });
@@ -666,12 +662,15 @@ var NewRunForm = function(plan){
         },{
             text: 'Cancel',
             type: 'reset',
+            id: 'nrf_cancel_btn',
             handler: function(){
                 Ext.getCmp('newrunsouth').getForm().reset();
                 try {
                     Ext.getCmp('newRun-win').close();
                 }
-                catch (err){}
+                catch (err){
+                    window.location = 'tr_show_product.cgi';
+                }
             }
         }]
     });
diff --git a/mozilla/webtools/testopia/testopia/js/util.js b/mozilla/webtools/testopia/testopia/js/util.js
index 3c179dfa4c0..fa25c273222 100755
--- a/mozilla/webtools/testopia/testopia/js/util.js
+++ b/mozilla/webtools/testopia/testopia/js/util.js
@@ -956,7 +956,8 @@ DocCompareToolbar = function(object, id){
                     var foo = Ext.getCmp('doc_view').getValue();
                     var tab = Ext.getCmp('object_panel').add({
                         title: 'Version ' + Ext.getCmp('doc_view').getValue(),
-                        closable: true
+                        closable: true,
+                        autoScroll: true
                     });
                     tab.show();
                     tab.load({