diff --git a/webtools/bonsai/showcheckins.cgi b/webtools/bonsai/showcheckins.cgi
index f84a7e0d35a4..d7072f795730 100755
--- a/webtools/bonsai/showcheckins.cgi
+++ b/webtools/bonsai/showcheckins.cgi
@@ -88,10 +88,19 @@ if (exists($::FORM{'person'})) {
      @list = @::CheckInList;
 }
 
+my $treepart = '';
+$treepart = "&treeid=$::TreeID"    if ($::TreeID ne "default");
+my $branchpart = '';
+$branchpart = "&branch=$::TreeInfo{$::TreeID}{branch}"
+     if ($::TreeInfo{$::TreeID}{branch});
 
 $subhead .= "<br><font color=red>
-Be aware that you are looking at an old hook!</font>"
+These checkins are <em>not</em> from <a 
+href='showcheckins.cgi?$treepart$branchpart'>the current 
+hook</a>!</font><br>"
      if (Param('readonly'));
+$subhead .= "View a <a href=\"viewold.cgi?" . BatchIdPart('?') . "&target=showcheckins\">different 
+day's checkins</a>.<br>";
 
 PutsHeader($title, $head, $subhead);
 
@@ -201,10 +210,6 @@ print "
 
 my $count = 0;
 my $maxcount = 100;
-my $branchpart = '';
-
-$branchpart = "&branch=$::TreeInfo{$::TreeID}{branch}"
-     if ($::TreeInfo{$::TreeID}{branch});
 
 foreach $checkin (@list) {
      $info = eval("\\\%$checkin");
diff --git a/webtools/bonsai/toplevel.cgi b/webtools/bonsai/toplevel.cgi
index c3252abb3b0a..76338f3d3786 100755
--- a/webtools/bonsai/toplevel.cgi
+++ b/webtools/bonsai/toplevel.cgi
@@ -76,19 +76,26 @@ foreach my $tree (@::TreeList) {
 print "</SELECT></H3></FORM>\n";
 
 
+my $treepart = '';
+$treepart = "&treeid=$::TreeID"
+    if ($::TreeID ne "default");
+my $branchpart='';
+$branchpart="&branch=$::TreeInfo{$::TreeID}{branch}"
+    if $::TreeInfo{$::TreeID}{branch};
 if (Param('readonly')) {
-    print "<h2><font color=red>
-Be aware that you are looking at an old hook!</font></h2>\n";
+    print "<div style='border: 2px dotted grey; padding: 2px'><h2><font color=red>
+Be aware that this is <em>not</em> the <a href='toplevel.cgi?$treepart$branchpart'>current 
+hook!</a></font></h2>\n";
+} else {
+    print "<div><tt>" . time2str("%m/%d/%Y %T %Z", time())."</tt>:";
 }
-
-print "<tt>" . time2str("%m/%d/%Y %T %Z", time()) .
-      "</tt>: The tree is currently $openword<br>\n";
+print " The tree is currently $openword<br>\n";
 unless ($::TreeOpen) {
     print "The tree has been closed since <tt>" .
          MyFmtClock($::CloseTimeStamp) . "</tt>.<BR>\n";
 }
 
-print "The last known good tree had a timestamp of <tt>";
+print "</div>The last known good tree had a timestamp of <tt>";
 print time2str("%m/%d/%Y %T %Z", $::LastGoodTimeStamp) . "</tt>.<br>";
 print "<hr><pre variable>$::MOTD</pre><hr>";
 print "<br clear=all>";
@@ -204,9 +211,8 @@ Can't contact the directory server at $ldapserver:$ldapport</font>\n";
 
 my $cvsqueryurl = "cvsqueryform.cgi?" .
     "cvsroot=$::TreeInfo{$::TreeID}{repository}" .
-    "&module=$::TreeInfo{$::TreeID}{module}";
-$cvsqueryurl.= "&branch=$::TreeInfo{$::TreeID}{branch}"
-     if ($::TreeInfo{$::TreeID}{branch});
+    "&module=$::TreeInfo{$::TreeID}{module}" .
+    $branchpart;
 my $bip = BatchIdPart('?');
 my $tinderboxbase = Param('tinderboxbase');
 my $tinderboxlink = '';
diff --git a/webtools/bonsai/viewold.cgi b/webtools/bonsai/viewold.cgi
index 514734752fcf..8112fbfde8db 100755
--- a/webtools/bonsai/viewold.cgi
+++ b/webtools/bonsai/viewold.cgi
@@ -55,7 +55,14 @@ foreach my $i (glob(DataDir() . "/batch-*\[0-9\].pl")) {
 
 @list = sort {$b <=> $a} @list;
 
-print "<FORM method=get action=\"toplevel.cgi\">\n";
+print '<FORM method=get action="';
+if ($::FORM{'target'} eq 'showcheckins') {
+print 'showcheckins.cgi';
+} else {
+print 'toplevel.cgi';
+}
+print '">
+';
 print "<INPUT TYPE=HIDDEN NAME=treeid VALUE=$::TreeID>\n";
 print "<INPUT TYPE=SUBMIT Value=\"Submit\"><BR>\n";