diff --git a/templates/bugfield_input_text.tpl b/templates/bugfield_input_text.tpl
index b321b1e..576fc8f 100644
--- a/templates/bugfield_input_text.tpl
+++ b/templates/bugfield_input_text.tpl
@@ -1,6 +1,6 @@
diff --git a/templates/editattach.tpl b/templates/editattach.tpl
index 06b9af5..bfffd9e 100644
--- a/templates/editattach.tpl
+++ b/templates/editattach.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
$attachment[filename] - $bug[summary]
diff --git a/templates/editcomment.tpl b/templates/editcomment.tpl
index b03c443..570e8f4 100644
--- a/templates/editcomment.tpl
+++ b/templates/editcomment.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{@"Edit Comment %1$s"} - $bug[summary]
diff --git a/templates/explain_automation.tpl b/templates/explain_automation.tpl
index b66c4ee..90fb868 100644
--- a/templates/explain_automation.tpl
+++ b/templates/explain_automation.tpl
@@ -1,5 +1,5 @@
$doctype
-
+
$headinclude
{$bugsys->options['trackertitle']} - {@"Automations"}
diff --git a/templates/explain_product.tpl b/templates/explain_product.tpl
index c67aec6..cc841b4 100644
--- a/templates/explain_product.tpl
+++ b/templates/explain_product.tpl
@@ -1,5 +1,5 @@
$doctype
-
+
$headinclude
{$bugsys->options['trackertitle']} - {@"Products"}
diff --git a/templates/favorites.tpl b/templates/favorites.tpl
index fa81285..36e9234 100644
--- a/templates/favorites.tpl
+++ b/templates/favorites.tpl
@@ -1,5 +1,5 @@
$doctype
-
+
$headinclude
{$bugsys->options['trackertitle']} - {@"My Favorite Bugs"}
diff --git a/templates/headinclude.tpl b/templates/headinclude.tpl
index 24c16d9..339ec1a 100644
--- a/templates/headinclude.tpl
+++ b/templates/headinclude.tpl
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/templates/help_window.tpl b/templates/help_window.tpl
index 24b575c..181aa55 100644
--- a/templates/help_window.tpl
+++ b/templates/help_window.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{@"Help"} - $topic[title]
diff --git a/templates/history.tpl b/templates/history.tpl
index 13134ae..88add76 100644
--- a/templates/history.tpl
+++ b/templates/history.tpl
@@ -1,5 +1,5 @@
$doctype
-
+
$headinclude
{@"Bug History"} - $bug[summary]
diff --git a/templates/login.tpl b/templates/login.tpl
index 58df23e..17840a2 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{$bugsys->options['trackertitle']} - {@"Login"}
diff --git a/templates/lostpassword.tpl b/templates/lostpassword.tpl
index 84e5ff2..9694a9f 100644
--- a/templates/lostpassword.tpl
+++ b/templates/lostpassword.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{$bugsys->options['trackertitle']} - {@"Lost Password"}
diff --git a/templates/newattach.tpl b/templates/newattach.tpl
index 0bbac09..99e6892 100644
--- a/templates/newattach.tpl
+++ b/templates/newattach.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{@"New Attachment"} - $bug[summary]
diff --git a/templates/newreport.tpl b/templates/newreport.tpl
index e164226..61c8801 100644
--- a/templates/newreport.tpl
+++ b/templates/newreport.tpl
@@ -1,9 +1,9 @@
$doctype
-
+
$headinclude
-
-
+
+
{@"New Bug Report"} - {$bugsys->options['trackertitle']}
diff --git a/templates/passwordreset.tpl b/templates/passwordreset.tpl
index afec961..7ce3eb2 100644
--- a/templates/passwordreset.tpl
+++ b/templates/passwordreset.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{$bugsys->options['trackertitle']} - {@"Reset Password"}
diff --git a/templates/quicksearch.tpl b/templates/quicksearch.tpl
index 5f871d8..4c6cdd1 100644
--- a/templates/quicksearch.tpl
+++ b/templates/quicksearch.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{$bugsys->options['trackertitle']} - {@"Quick Search"}
diff --git a/templates/register.tpl b/templates/register.tpl
index 996b7f4..5eec074 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{$bugsys->options['trackertitle']} - {@"Register"}
diff --git a/templates/search.tpl b/templates/search.tpl
index 0d2631f..bbfcbc1 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -1,9 +1,9 @@
$doctype
-
+
$headinclude
-
-
+
+
{$bugsys->options['trackertitle']} - {@"Search"}
diff --git a/templates/search_results.tpl b/templates/search_results.tpl
index 6105743..a7e730d 100644
--- a/templates/search_results.tpl
+++ b/templates/search_results.tpl
@@ -1,5 +1,5 @@
$doctype
-
+
$headinclude
{$bugsys->options['trackertitle']} - {@"Search Results"}
diff --git a/templates/search_save.tpl b/templates/search_save.tpl
index e02c759..fe20921 100644
--- a/templates/search_save.tpl
+++ b/templates/search_save.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{$bugsys->options['trackertitle']} - {@"Save Search"}
diff --git a/templates/search_update.tpl b/templates/search_update.tpl
index ec240a8..5fbcc9c 100644
--- a/templates/search_update.tpl
+++ b/templates/search_update.tpl
@@ -1,9 +1,9 @@
$doctype
-
+
$headinclude
-
-
+
+
{$bugsys->options['trackertitle']} - {@"Mass Update"}
diff --git a/templates/showreport.tpl b/templates/showreport.tpl
index 812936d..a8f2540 100644
--- a/templates/showreport.tpl
+++ b/templates/showreport.tpl
@@ -1,10 +1,10 @@
$doctype
-
+
$headinclude
-
-
-
+
+
+
{@"Bug Report %1$s"} - $bug[summary_title]
@@ -261,6 +261,8 @@ $header
+$description
+
$comments
$footer
\ No newline at end of file
diff --git a/templates/std_error.tpl b/templates/std_error.tpl
index 40cfa09..d821a31 100644
--- a/templates/std_error.tpl
+++ b/templates/std_error.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{$bugsys->options['trackertitle']} - {@"Error"}
diff --git a/templates/std_message.tpl b/templates/std_message.tpl
index 20aef5c..1b7afaa 100644
--- a/templates/std_message.tpl
+++ b/templates/std_message.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{$bugsys->options['trackertitle']} - {@"Confirm"}{@"Notice"}
diff --git a/templates/std_redirect.tpl b/templates/std_redirect.tpl
index 2e6ac39..22276f5 100644
--- a/templates/std_redirect.tpl
+++ b/templates/std_redirect.tpl
@@ -1,8 +1,8 @@
$doctype
-
+
$headinclude
-
+
{$bugsys->options['trackertitle']} - {@"Redirect..."}
diff --git a/templates/trackerhome.tpl b/templates/trackerhome.tpl
index 2d5b961..f446a41 100644
--- a/templates/trackerhome.tpl
+++ b/templates/trackerhome.tpl
@@ -1,5 +1,5 @@
$doctype
-
+
$headinclude
{$bugsys->options['trackertitle']} - {@"Bug Listing"}
diff --git a/templates/userctrl.tpl b/templates/userctrl.tpl
index 16a962b..8c4fc62 100644
--- a/templates/userctrl.tpl
+++ b/templates/userctrl.tpl
@@ -1,9 +1,9 @@
$doctype
-
+
$headinclude
-
-
+
+
{$bugsys->options['trackertitle']} - {@"User Options"}
@@ -76,11 +76,11 @@ $header
|
- {@"Reporter"} |
+ {@"Reporter"} |
{@"Assignee"} |
- {@"Favorite"} |
+ {@"Favorite"} |
{@"Voter"} |
- {@"Commenter"} |
+ {@"Commenter"} |