diff --git a/mozilla/webtools/bugzilla/changepassword.cgi b/mozilla/webtools/bugzilla/changepassword.cgi
index 4a12b67f566..da9429b8ab0 100755
--- a/mozilla/webtools/bugzilla/changepassword.cgi
+++ b/mozilla/webtools/bugzilla/changepassword.cgi
@@ -124,9 +124,8 @@ SendSQL("update profiles set emailnotification='$::FORM{'emailnotification'}' wh
 
 
 PutHeader("Preferences updated.");
-
-
 print "
 Your preferences have been updated.
-<p>
-<a href=query.cgi>Back to query page.</a>\n";
+<p>";
+navigation_header();
+
diff --git a/mozilla/webtools/bugzilla/globals.pl b/mozilla/webtools/bugzilla/globals.pl
index 94a4f740269..b667f48adbe 100644
--- a/mozilla/webtools/bugzilla/globals.pl
+++ b/mozilla/webtools/bugzilla/globals.pl
@@ -346,7 +346,7 @@ sub GetVersionTable {
         do 'data/versioncache';
 
         if (!defined %::versions) {
-            die "Can't generate version info; tell terry.";
+            die "Can't generate file data/versioncache";
         }
     }
 }
diff --git a/mozilla/webtools/bugzilla/help.html b/mozilla/webtools/bugzilla/help.html
index 0d7244df252..4896fbd2a3c 100644
--- a/mozilla/webtools/bugzilla/help.html
+++ b/mozilla/webtools/bugzilla/help.html
@@ -53,3 +53,10 @@ reporter area
 bug_file_loc
 short_desc
 </PRE>
+<HR>
+<H1>Browser Notes</H1>
+<P>Bugzilla uses several non-standard Netscape extentions, but this does not seem
+to case any problem with other browsers.  The lynx browser does work, but lynx
+seems to cache results of a .cgi.  You'll sometimes need to press CONTROL-R to reload
+the screen to see an update.
+
diff --git a/mozilla/webtools/bugzilla/index.html b/mozilla/webtools/bugzilla/index.html
index 7cef3c1e2cc..ba9a0a7ee2a 100644
--- a/mozilla/webtools/bugzilla/index.html
+++ b/mozilla/webtools/bugzilla/index.html
@@ -67,10 +67,13 @@ bugzilla.
 
 But it all boils down to a choice of:
 <br>
-<a href="query.cgi">Go to the query page to start.</a><br>
-<a href="enter_bug.cgi">Enter a new bug</a><br>
-<a href="reports.cgi">Bug reports</a><br>
+<a href="query.cgi">Query existing bug reports</a><br>
+<a href="enter_bug.cgi">Enter a new bug report</a><br>
+<a href="reports.cgi">Get summary reports</a><br>
+<p>
 <a href="createaccount.cgi">Open a new Bugzilla account</a><br>
+<a href="relogin.cgi">Forget the currently stored login</a><br>
+<a href="changepassword.cgi">Change password or user preferences</a><br>
 <FORM METHOD=GET ACTION=show_bug.cgi><INPUT TYPE=SUBMIT VALUE="Find"> bug
 # <INPUT NAME=id SIZE=6></FORM></TD>
 
diff --git a/mozilla/webtools/bugzilla/relogin.cgi b/mozilla/webtools/bugzilla/relogin.cgi
index 5ef523945c2..d1e2700aa71 100755
--- a/mozilla/webtools/bugzilla/relogin.cgi
+++ b/mozilla/webtools/bugzilla/relogin.cgi
@@ -34,20 +34,9 @@ Content-type: text/html
 The cookie that was remembering your login is now gone.  The next time you
 do an action that requires a login, you will be prompted for it.
 <p>
-<a href=query.cgi>Back to the query page.</a>
 ";
 
+navigation_header();
+
 exit;
 
-# The below was a different way, that prompted you for a login right then.
-
-# catch {unset COOKIE(Bugzilla_login)}
-# catch {unset COOKIE(Bugzilla_password)}
-# confirm_login
-
-# puts "Content-type: text/html\n"
-# puts "<H1>OK, logged in.</H1>"
-# puts "You are now logged in as <b>$COOKIE(Bugzilla_login)</b>."
-# puts "<p>"
-# puts "<a href=query.cgi>Back to the query page.</a>"
-