diff --git a/mozilla/webtools/lxr/index.html b/mozilla/webtools/lxr/index.html
index 6d1be9a040c..a30ffb39d29 100644
--- a/mozilla/webtools/lxr/index.html
+++ b/mozilla/webtools/lxr/index.html
@@ -9,47 +9,114 @@
  SRC="http://www.mozilla.org/images/mozilla-banner.gif" ALT=""
  BORDER=0 WIDTH=600 HEIGHT=58></A></TD></TR></TABLE>
 
-<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=16 WIDTH="100%">
+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=6 WIDTH="100%">
  <TR>
   <TH ALIGN=CENTER COLSPAN=3>
+   <BR>
    <FONT SIZE="+3">Mozilla Cross-Reference</FONT>
+   <BR><BR>
   </TH>
  </TR>
  <TR>
   <TD ALIGN=TOP VALIGN=LEFT>
 
-   <FONT SIZE="+1">
-    <P><BR><BR>
-    <P ALIGN=CENTER><B>Search:</B>
-    <P>
-   </FONT>
-
-   <TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH="100%">
+   <TABLE BORDER CELLPADDING=10 CELLSPACING=0 WIDTH="100%" BGCOLOR="#EEEEEE">
     <TR>
-     <TD ALIGN=RIGHT VALIGN=TOP NOWRAP>
-      <FORM METHOD=GET ACTION="ident">
-       <A HREF="ident">Identifier</A>:
-       <INPUT TYPE=TEXT NAME="i" VALUE="" SIZE=6>
-       <INPUT TYPE=SUBMIT VALUE="Find">
-      </FORM>
-      <FORM METHOD=GET ACTION="search">
-       <A HREF="search">Text</A>:
-       <INPUT TYPE=TEXT NAME="string" VALUE="" SIZE=6>
-       <INPUT TYPE=SUBMIT VALUE="Find">
-      </FORM>
-      <FORM METHOD=GET ACTION="find">
-       <A HREF="find">File</A>:
-       <INPUT TYPE=TEXT NAME="string" VALUE="" SIZE=6>
-       <INPUT TYPE=SUBMIT VALUE="Find">
-      </FORM>
+     <TD>
+
+      <BR>
+      <P ALIGN=CENTER><FONT SIZE="+1"><B>Starting Points:</B></FONT>
+      <P>
+
+      <TABLE BORDER=0 CELLPADDING=0 CELLSPACING=2 WIDTH="100%">
+       <TR>
+        <TD>
+         <FONT SIZE="+1"><A HREF="source"><B>mozilla/</B></A></FONT>
+        </TD>
+        <TD>
+         <FONT SIZE="-1">
+          Click here to start<BR>
+          browsing at the root<BR>
+          of the directory tree.
+         </FONT>
+        </TD>
+       </TD>
+      </TABLE>
+
+      <P>
+
+      <TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH="100%">
+       <TR>
+	<TD ALIGN=RIGHT VALIGN=TOP NOWRAP>
+
+	 <FORM METHOD=GET ACTION="ident">
+	  <TABLE BORDER=0 CELLPADDING=2 CELLSPACING=0>
+	   <TR>
+	    <TD ALIGN=RIGHT VALIGN=CENTER>
+	     <A HREF="ident"><B>Identifier <BR>Search:</B></A>
+	    </TD>
+	    <TD>
+	     <INPUT TYPE=TEXT NAME="i" VALUE="" SIZE=6>
+	     <INPUT TYPE=SUBMIT VALUE="Find">
+	    </TD>
+	   </TR>
+	   <TR>
+	    <TD></TD>
+	    <TD><FONT SIZE="-1">
+	     Use this field to search<BR>for C/C++ tokens.</FONT>
+	    </TD>
+	   </TR>
+	  </TABLE>
+	 </FORM>
+
+	 <FORM METHOD=GET ACTION="search">
+	  <TABLE BORDER=0 CELLPADDING=2 CELLSPACING=0>
+	   <TR>
+	    <TD ALIGN=RIGHT VALIGN=CENTER>
+	     <A HREF="search"><B>Text <BR>Search:</A></B>
+	    </TD>
+	    <TD>
+	     <INPUT TYPE=TEXT NAME="string" VALUE="" SIZE=6>
+	     <INPUT TYPE=SUBMIT VALUE="Find">
+	    </TD>
+	   </TR>
+	   <TR>
+	    <TD></TD>
+	    <TD><FONT SIZE="-1">
+	     Use this field to search<BR>through all the text.</FONT>
+	    </TD>
+	   </TR>
+	  </TABLE>
+	 </FORM>
+
+	 <FORM METHOD=GET ACTION="find">
+	  <TABLE BORDER=0 CELLPADDING=2 CELLSPACING=0>
+	   <TR>
+	    <TD ALIGN=RIGHT VALIGN=CENTER>
+	     <A HREF="find"><B>File Name <BR>Search:</B></A>
+	    </TD>
+	    <TD>
+	      <INPUT TYPE=TEXT NAME="string" VALUE="" SIZE=6>
+	      <INPUT TYPE=SUBMIT VALUE="Find">
+	    </TD>
+	   </TR>
+	   <TR>
+	    <TD></TD>
+	    <TD><FONT SIZE="-1">
+	     Use this field to search<BR>for files by name.</FONT>
+	    </TD>
+	   </TR>
+	  </TABLE>
+	 </FORM>
+
+	</TD>
+       </TR>
+      </TABLE>
+
      </TD>
     </TR>
    </TABLE>
 
-    <FONT SIZE="+1">
-     <P ALIGN=CENTER><B>or, start <BR><A HREF="source">at the top</A>.</B>
-    </FONT>
-
   </TD>
   <TD WIDTH=8></TD>
   <TD ALIGN=TOP VALIGN=LEFT>
@@ -59,15 +126,15 @@
 The sources displayed are those that are currently checked 
 in to the mainline of the mozilla.org
 <A HREF="http://www.mozilla.org/cvs.html">CVS server</A>;
-these pages are updated several times a day, so they should
+these pages are updated many times a day, so they should
 be pretty close to the latest-<WBR>and-<WBR>greatest.
 
-<P>Its possible to search among the identifiers (function and variable
-names, etc.) as well as the entire Mozilla source text.  The free-text
-search is implemented using 
-<A HREF="http://glimpse.cs.arizona.edu">Glimpse</A>, so all the
-capabilities of Glimpse are available. Regular expression
-searches are especially useful. 
+<P>Its possible to search among the <A HREF="ident">identifiers</A>
+(function and variable names, etc.) as well as the entire Mozilla 
+source text.  The <A HREF="search">free-text search</A> is implemented 
+using <A HREF="http://glimpse.cs.arizona.edu">Glimpse</A>, so all the
+capabilities of Glimpse are available.  <A HREF="search-help.html">Regular
+expression</A> searches are especially useful.
 
 <P>An identifier is a macro, typedef, struct, enum, union, function,
 function prototype or variable.   The individual files of the
@@ -76,7 +143,7 @@ identifiers.  (This means: please don't use a web-crawler to try and
 download all of these pages.)
 
 <P>The pages here are generated by the 
-<A HREF="http://lxr.linux.no/">LXR</A> tool which was originally 
+<A HREF="http://lxr.linux.no/">LXR</A> tool, which was originally 
 written to display the source code of the Linux kernel (LXR stands
 for ``Linux Cross Reference.'')  Check out the
 <A HREF="http://lxr.linux.no/">main LXR site</a> for more information.