diff --git a/checkin_notes b/checkin_notes
index 5d089ad5b7..62c586b12a 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12290,3 +12290,6 @@ Karl 2004-04-12
 
     tools/
         update_versions
+
+David  May 14 2004
+    - various web fixes
diff --git a/html/forum/index.php b/html/forum/index.php
index bbe71c4234..5bb84e330e 100644
--- a/html/forum/index.php
+++ b/html/forum/index.php
@@ -11,7 +11,7 @@ show_forum_title(NULL, NULL, false);
 echo "<p>
     If you have a question or problem, please use the
     <a href=help_desk.php>Questions/problems</a>
-    are instead of the Message boards.</p>
+    area instead of the Message boards.</p>
     <p>
     Do a <a href=text_search_form.php>keyword search</a>
     of messages.
diff --git a/html/forum/subscribe.php b/html/forum/subscribe.php
index 52f6a9f42d..7204a77482 100644
--- a/html/forum/subscribe.php
+++ b/html/forum/subscribe.php
@@ -2,8 +2,6 @@
 require_once('../inc/subscribe.inc');
 require_once('../inc/util.inc');
 
-db_init();
-
 $action = $_GET['action'];
 $thread = $_GET['thread'];
 
diff --git a/html/forum/text_search_action.php b/html/forum/text_search_action.php
index 5da2a0affe..e8e39722ba 100644
--- a/html/forum/text_search_action.php
+++ b/html/forum/text_search_action.php
@@ -8,10 +8,8 @@ $offset = $_GET['offset'];
 if (!$offset) $offset=0;
 $count = 10;
 
-page_head("Search results");
-
 if ($_GET['titles']) {
-    echo "<h2>Titles containing '$search_string'</h2>\n";
+    page_head("Titles containing '$search_string'");
     $q = "select * from thread where match(title) against ('$search_string') limit $offset,$count";
     $result = mysql_query($q);
     echo "<table>";
@@ -29,7 +27,7 @@ if ($_GET['titles']) {
 }
 
 if ($_GET['bodies']) {
-    echo "<h2>Messages containing '$search_string'</h2>\n";
+    page_head("Messages containing '$search_string'");
     $q = "select * from post where match(content) against ('$search_string') limit $offset,$count";
     $result = mysql_query($q);
     echo "<table>";
diff --git a/html/forum/text_search_form.php b/html/forum/text_search_form.php
index bfcf510d90..53623c5c7f 100644
--- a/html/forum/text_search_form.php
+++ b/html/forum/text_search_form.php
@@ -6,8 +6,6 @@ require_once("../inc/util.inc");
 page_head("Message search");
 
 echo "
-    <h2>Message search</h2>
-
     This page lets you search for messages containing particular words.
     All Message boards and Question/answer areas will be searched.
     <br><br>
diff --git a/html/forum/user_posts.php b/html/forum/user_posts.php
index 74b193479a..5b3fb3dc8f 100644
--- a/html/forum/user_posts.php
+++ b/html/forum/user_posts.php
@@ -11,7 +11,6 @@ $count = 10;
 $user = lookup_user_id($userid);
 
 page_head("Posts by $user->name");
-echo "<h2>Posts by $user->name</h2>\n";
 $result = mysql_query("select * from post where user=$userid order by id desc limit $offset,$count");
 $n = 0;
 start_table();
diff --git a/html/inc/gallery.inc b/html/inc/gallery.inc
index be52abdba4..f70a3e9623 100644
--- a/html/inc/gallery.inc
+++ b/html/inc/gallery.inc
@@ -61,7 +61,7 @@ function build_picture_pages($width, $height) {
         page_head("User Picture Gallery: Page $page of $numPages", $descriptor);
 
         fwrite($descriptor,
-            "<h2>User Profile Pictures</h2>Last updated "
+            "Last updated "
             . pretty_time_str(time())
             . "\n<p>Browse the user profiles by picture.
             Only user profiles with pictures are listed here."
@@ -230,9 +230,8 @@ function build_profile_pages($members, $pageHead, $pageTitle, $rowsPerPage, $col
         $descriptor = fopen($filename, "w");
 
         $head = $pageHead . ": Page $page of $numPages";
-        page_head($pageHead, $descriptor);
+        page_head($pageTitle, $descriptor);
 
-        fwrite($descriptor, "<h2>$pageTitle</h2>\n");
         fwrite($descriptor, "Last updated " . pretty_time_str(time()) . "<p>\n");
 
         $offset = (($page-1) * $rowsPerPage * $colsPerPage);
@@ -254,7 +253,7 @@ function build_country_summary_page($countryMembers) {
     $descriptor = fopen($filename, "w");
 
     page_head("User Profiles by Country", $descriptor);
-    fwrite($descriptor, "<h2>User Profiles by Country</h2>Last updated " . pretty_time_str(time()) . "<p>");
+    fwrite($descriptor, "Last updated " . pretty_time_str(time()) . "<p>");
 
     fwrite($descriptor, "<table border=0>\n");
     fwrite($descriptor, "<tr><td><b>Country</b></td><td align=\"center\"><b>Profiles</b></td></tr>\n");
diff --git a/html/inc/host.inc b/html/inc/host.inc
index 540f0c7db9..44e63cfe9a 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -115,9 +115,8 @@ function show_host($host, $private, $ipprivate) {
 
 }
 
-function host_table_start($title, $private, $show_owner) {
+function host_table_start($private, $show_owner) {
     start_table();
-    row1($title, 7);
     echo "<tr>";
     echo "<th>Host ID<br><font size=-2>Click for more info</font></th>\n";
     if ($private) {
diff --git a/html/inc/profile.inc b/html/inc/profile.inc
index aa1f891538..4b1ed74966 100644
--- a/html/inc/profile.inc
+++ b/html/inc/profile.inc
@@ -331,7 +331,7 @@ function show_result_page() {
     page_head("Profile Saved");
 
     echo "
-<h1>Congratulations!</h1><p>
+<h2>Congratulations!</h2><p>
 Your profile was successfully entered into our database.<br><br>
 <a href=view_profile.php?userid=$user->id>View your profile</a><br>
 ";
@@ -470,10 +470,6 @@ function show_profile($userid, $verify_mode=false) {
 }
 
 function show_profile_summary($user, $profile_info, $can_edit, $verify_mode) {
-    echo "
-        <h2>Profile: $user->name</h2>
-    ";
-
     if (!$can_edit && !$verify_mode) {
         show_view_buttons($user->id);
     }
diff --git a/html/inc/team.inc b/html/inc/team.inc
index ce00d9caf4..999839168e 100644
--- a/html/inc/team.inc
+++ b/html/inc/team.inc
@@ -6,14 +6,11 @@ require_once("../inc/sanitize_html.inc");
 require_once("../inc/countries.inc");
 
 function display_team_page($team, $user) {
-    page_head("$team->name");
-    echo "<h2>Team page for ";
     if (strlen($team->name_html)) {
-        echo "$team->name_html";
+        page_head("$team->name_html");
     } else {
-        echo $team->name;
+        page_head("$team->name");
     }
-    echo "</h2>";
     if ($user->teamid == $team->id) {
         echo "You currently belong to this team
             <ul>
diff --git a/html/inc/user.inc b/html/inc/user.inc
index 305ef6d51b..1b93dd3351 100644
--- a/html/inc/user.inc
+++ b/html/inc/user.inc
@@ -47,7 +47,12 @@ function show_user_profile_private($user) {
         $email_text
     );
     row2("Name", $user->name);
-    row2("URL", "http://$user->url");
+    if (strlen($user->url)) {
+        $x = "http://$user->url";
+    } else {
+        $x = "none";
+    }
+    row2("URL", $x);
     row2("Country", $user->country);
     row2("Postal code", $user->postal_code);
     if ($user->signature) {
@@ -55,6 +60,7 @@ function show_user_profile_private($user) {
         row2("Forums signature", $x);
     }
     row2("", "<a href=edit_user_info_form.php>Edit account info</a>");
+    row2("", "<a href=logout.php>Log out</a>");
 
     row1("Profile");
     $sql = "SELECT * FROM profile WHERE userid = ".$user->id;
diff --git a/html/inc/util.inc b/html/inc/util.inc
index db4d8f4a79..5578a86f4d 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -126,7 +126,7 @@ function page_head($title, $fd=null) {
     $styleSheet = URL_BASE . STYLESHEET;
 
     write_fd($fd,
-        "<html><head><title>$title</title>
+        "<html><head><title>".strip_tags($title)."</title>
         <link rel=stylesheet type=text/css href=\"$styleSheet\">
         </head>
         <body bgcolor=ffffff>
@@ -179,7 +179,7 @@ function pretty_time_str($x) {
     return time_str($x);
 }
 
-function start_table($extra="") {
+function start_table($extra="width=100%") {
     echo "<table border=1 cellpadding=5 $extra>";
 }
 
diff --git a/html/user/download_network.php b/html/user/download_network.php
index 245880d5ba..ed0b769029 100644
--- a/html/user/download_network.php
+++ b/html/user/download_network.php
@@ -8,7 +8,6 @@ init_session();
 
 page_head("Download BOINC add-on software");
 echo "
-    <h2>Download BOINC add-on software</h2>
     You can download applications from any of the following categories.
     Please note that these applications are not endorsed by ".PROJECT." and that you use them at your own risk:<p>\n
 ";
diff --git a/html/user/hosts_user.php b/html/user/hosts_user.php
index 7f959df86f..5976568b15 100644
--- a/html/user/hosts_user.php
+++ b/html/user/hosts_user.php
@@ -14,7 +14,7 @@
         mysql_free_result($result);
         if ($user->show_hosts) {
             page_head("Computers belonging to $user->name");
-            host_table_start("Computers belonging to $user->name", false, false);
+            host_table_start(false, false);
         } else {
             echo "Hidden\n";
             exit();
@@ -24,7 +24,7 @@
         $user = get_logged_in_user();
         $userid = $user->id;
         page_head("Your computers");
-        host_table_start("Your computers", true, false);
+        host_table_start(true, false);
         $private = true;
     }
     $i = 1;
diff --git a/html/user/index.php b/html/user/index.php
index 1a8a5ff232..9c2ad4dde0 100644
--- a/html/user/index.php
+++ b/html/user/index.php
@@ -37,6 +37,7 @@ if (project_is_stopped()) {
         <li><a href=".URL_BASE."home.php>Your account</a> - view stats, modify preferences
         <li><a href=".URL_BASE."team.php>Teams</a> - create or join a team
         <li><a href=".URL_BASE."download.php>Download BOINC</a>
+        <li><a href=download_network.php>Add-ons</a>
         </ul>
         <h3>Community</h3>
         <ul>
diff --git a/html/user/top_hosts.php b/html/user/top_hosts.php
index a8432ce502..9cefc475ae 100644
--- a/html/user/top_hosts.php
+++ b/html/user/top_hosts.php
@@ -26,7 +26,7 @@
         $sort_clause = "expavg_credit desc, total_credit desc";
     }
     $result = mysql_query("select * from host order by $sort_clause limit $n offset $offset");
-    host_table_start("Top computers", false, true);
+    host_table_start(false, true);
     $i = $offset+1;
     while ($host = mysql_fetch_object($result)) {
         show_host_row($host, $i, false, true);
diff --git a/lib/util.C b/lib/util.C
index 4415dbc3df..e8e853fd7e 100755
--- a/lib/util.C
+++ b/lib/util.C
@@ -612,7 +612,7 @@ void update_average(
 
     if (avg_time) {
         double diff = now - avg_time;
-        if (diff==0) diff=3600;     // just in case
+        if (diff<=0) diff=3600;     // just in case
         double diff_days = diff/SECONDS_PER_DAY;
         double weight = exp(-diff*M_LN2/half_life);
         avg *= weight;