diff --git a/misc/smarty/templates_en/edit_list.tpl b/misc/smarty/templates_en/edit_list.tpl
index 0a6bbcb..f6e3e69 100644
--- a/misc/smarty/templates_en/edit_list.tpl
+++ b/misc/smarty/templates_en/edit_list.tpl
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <title>Edit list | {$headline}</title>
         <link rel="stylesheet" type="text/css" href="style.css">
         <script>
             //{literal} Do not use Smarty here
diff --git a/misc/smarty/templates_en/error.tpl b/misc/smarty/templates_en/error.tpl
index e3dddd7..9a80591 100644
--- a/misc/smarty/templates_en/error.tpl
+++ b/misc/smarty/templates_en/error.tpl
@@ -1,11 +1,17 @@
 <html>
     <head>
+        <title>Error | {$headline}</title>
         <link rel="stylesheet" type="text/css" href="style.css">
     </head>
     <body>
+        <div id="header">
             <div id="header_left">
                 <a href="{$web_url}">{$headline}</a>
             </div>
+            <div id="header_right">
+                <a href="logout.php">Logout ({$username})</a>
+            </div>
+        </div>
         <div id="error">
             {if $error_code == 1}
                 Domain can contain only english letters, dots, hyphens and digits.
diff --git a/misc/smarty/templates_en/index.tpl b/misc/smarty/templates_en/index.tpl
index 863d18f..ab5d1e5 100644
--- a/misc/smarty/templates_en/index.tpl
+++ b/misc/smarty/templates_en/index.tpl
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <title>Home | {$headline}</title>
         <link rel="stylesheet" type="text/css" href="style.css">
         <script>
             function validate_form()
@@ -24,11 +25,6 @@
                     return false;
                 }
             }
-
-            function confirm_delete()
-            {
-                return confirm("Do you really want to delete the mailing list?");
-            }
         </script>
     </head>
     <body>
diff --git a/misc/smarty/templates_en/login.tpl b/misc/smarty/templates_en/login.tpl
index 06fa6c8..7a95b88 100644
--- a/misc/smarty/templates_en/login.tpl
+++ b/misc/smarty/templates_en/login.tpl
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <title>Login | {$headline}</title>
         <link rel="stylesheet" type="text/css" href="style.css">
         <script>
             function validate_form()
