--- web/www/menu.inc	2004/03/21 23:58:07	1.1
+++ web/www/menu.inc	2004/03/25 22:46:37	1.6
@@ -1,54 +1,63 @@
-<div id="menu">
-  <h3 class="heading">
-    <img src="http://nwww.i-scream.org/cgi-bin/logo.jpg" class="cornerlogo" alt="a random image"/>
-    Main
-  </h3>
-
-  <p>
-    <a href="http://nwww.i-scream.org/">i-scream Home</a><br/>
-    <a href="http://nwww.i-scream.org/#news">News</a><br/>
-    <a href="http://nwww.i-scream.org/#search">Search</a><br/>
-  </p>
-
-  <h3 class="heading">Projects</h3>
-
-  <p>
-    <a href="http://nwww.i-scream.org/libstatgrab/">libstatgrab</a><br/>
-    <a href="http://nwww.i-scream.org/pystatgrab/">pystatgrab</a><br/>
-    <a href="http://nwww.i-scream.org/laroona/">Laroona</a><br/>
-    <a href="http://nwww.i-scream.org/cms/">CMS</a><br/>
-    <br/>
-    <a href="http://www.cs.kent.ac.uk/people/staff/tdb/#acl">Java TCP/UDP ACL's</a><br/>
-  </p>
-
-  <h3 class="heading">Resources</h3>
-
-  <p>
-    <a href="http://nwww.i-scream.org/cvs.shtml">CVS Repository</a><br/>
-    <br/>
-    <a href="http://nwww.i-scream.org/mailinglists.shtml">Mailing Lists</a><br/>
-    <a href="http://nwww.i-scream.org/support.shtml">Support</a><br/>
-    <a href="http://nwww.i-scream.org/support.shtml">Bug Tracking</a><br/>
-    <br/>
-    <a href="http://nwww.i-scream.org/license.shtml">Licensing</a><br/>
-  </p>
-
-  <h3 class="heading">i-scream</h3>
-
-  <p>
-    <a href="http://nwww.i-scream.org/who.shtml">Who We Are</a><br/>
-    <a href="http://nwww.i-scream.org/pgpkey.shtml">PGP Key</a><br/>
-  </p>
-
-  <h3 class="heading">Contact Us</h3>
-
-  <p>
-    <a href="mailto:dev@i-scream.org">dev@i-scream.org</a>
-  </p>
-
-  <p class="logo">
-    <a href="http://www.freebsd.org/">
-      <img src="http://nwww.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />
-    </a>
-  </p>
-</div>
+      <div id="menu">
+        <h3 class="heading">
+          <img src="<!--#include virtual="/cgi-bin/logo.cgi" -->" class="cornerlogo" alt="a random image"/>
+          <br />
+          Main
+        </h3>
+        <ul>
+          <li><a href="http://www.i-scream.org/">i-scream Home</a></li>
+          <li><a href="http://www.i-scream.org/#news">News</a></li>
+          <li><a href="http://www.i-scream.org/#search">Search</a></li>
+        </ul>
+        <h3 class="heading">
+          Projects
+        </h3>
+        <ul>
+          <li><a href="http://www.i-scream.org/libstatgrab/">libstatgrab</a></li>
+          <li><a href="http://www.i-scream.org/pystatgrab/">pystatgrab</a></li>
+          <li><a href="http://www.i-scream.org/laroona/">Laroona</a></li>
+          <li><a href="http://www.i-scream.org/cms/">CMS</a></li>
+        </ul>
+        <ul>
+          <li><a href="http://www.cs.kent.ac.uk/people/staff/tdb/#acl">Java TCP/UDP ACL's</a></li>
+        </ul>
+        <h3 class="heading">
+          Resources
+        </h3>
+        <ul>
+          <li><a href="http://www.i-scream.org/cvs.xhtml">CVS Repository</a></li>
+          <li><a href="http://wiki.i-scream.org/">Wiki</a></li>
+        </ul>
+        <ul>
+          <li><a href="http://www.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>
+          <li><a href="http://www.i-scream.org/support.xhtml">Support</a></li>
+          <li><a href="http://www.i-scream.org/support.xhtml">Bug Tracking</a></li>
+        </ul>
+        <ul>
+          <li><a href="http://www.i-scream.org/license.xhtml">Licensing</a></li>
+        </ul>
+        <h3 class="heading">
+          i-scream
+        </h3>
+        <ul>
+          <li><a href="http://www.i-scream.org/who.xhtml">Who We Are</a></li>
+          <li><a href="http://www.i-scream.org/pgpkey.xhtml">PGP Key</a></li>
+        </ul>
+        <h3 class="heading">
+          Contact Us
+        </h3>
+        <ul>
+          <li><a href="mailto:dev@i-scream.org">dev@i-scream.org</a></li>
+        </ul>
+        <p class="logo">
+          <a href="http://validator.w3.org/check/referer">
+            <img src="http://www.i-scream.org/images/valid-xhtml11.png" alt="Valid XHTML 1.1!" />
+          </a>
+          <a href="http://jigsaw.w3.org/css-validator/check/referer">
+            <img src="http://www.i-scream.org/images/vcss.png" alt="Valid CSS!" />
+          </a>
+          <a href="http://www.freebsd.org/">
+            <img src="http://www.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />
+          </a>
+        </p>
+      </div>
\ No newline at end of file