diff --git a/src/site/site.xml b/src/site/site.xml
index 3cf8dfc3b..214ea56e3 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -30,45 +30,31 @@
         
             <item
                     name="Getting Started"
-                    href="../WW/home.html"
+                    href="WW/home.html"
                     />        
             <item
                     name="Tutorials"
-                    href="../WW/tutorials.html"
+                    href="WW/tutorials.html"
                     />        
 
             <item
                     name="FAQs"
-                    href="../WW/faqs.html"
+                    href="WW/faqs.html"
                     />        
 
             <item
                     name="Guides"
-                    href="../WW/guides.html"
+                    href="WW/guides.html"
                     />        
 
             <item
                     name="Release Notes"
-                    href="../WW/release-notes-202.html"
+                    href="cd WW/release-notes-202.html"
                     />        
 
         </menu>
-        <menu name="Reference">
-            <item
-                    name="Struts Core API"
-                    href="struts2-core/apidocs/index.html"
-                    />        
-            <item
-                    name="New API (experimental)"
-                    href="struts2-api/apidocs/index.html"
-                    />        
-            <item
-                    name="Tag Reference"
-                    href="http://struts.apache.org/WW/tag-reference.html"
-                    />        
-        </menu>
 
-        <menu name="Product Support">
+        <menu name="Support">
             <item
                     name="User Mailing List"
                     href="http://struts.apache.org/mail.html"
@@ -83,6 +69,21 @@
                     />
         </menu>
 
+        <menu name="Reference">
+            <item
+                    name="Struts Core API"
+                    href="struts2-core/apidocs/index.html"
+                    />
+            <item
+                    name="New API (experimental)"
+                    href="struts2-api/apidocs/index.html"
+                    />
+            <item
+                    name="Tag Reference"
+                    href="http://struts.apache.org/WW/tag-reference.html"
+                    />
+        </menu>
+
         <menu name="Plugin API's">
 
            <item
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 8c2ff44f7..d5e7b741a 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -14,7 +14,7 @@
             <a name="Welcome"/>
 
         <div style="text-align:left">
-        <a href="../WW/home.html"><img src="images/struts2-merger2.png" alt="Struts 2 and WebWork merger" hspace="16" align="left"/></a>
+        <a href="WW/home.html"><img src="images/struts2-merger2.png" alt="Struts 2 and WebWork merger" hspace="16" align="left"/></a>
         
         <p>       
          <strong>Apache Struts 2 is an elegant, extensible framework</strong> for creating enterprise-ready Java web applications. 
@@ -31,7 +31,7 @@
         </p>      
         <p>
          For more about Apache Struts 2, visit
-         <a href="../WW/home.html">
+         <a href="WW/home.html">
             Getting Started.
          </a>
         </p>
@@ -147,7 +147,7 @@
             <subsection>
             <p>
             For more about Apache Struts 2, visit
-            <a href="../WW/home.html">
+            <a href="WW/home.html">
               Getting Started.
             </a>
             </p>