diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index 6ae83d11223acc974028882a27ded7bd13eb1adf..d1903f64572d4f83fa6e0c1f6ffab4ed2db14549 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -78,7 +78,7 @@
               <li><a href="#fixme">FAQs</a></li>
             </ul>
           </li>
-          <li class="who"><a href="#fixme">Who we are</a>
+          <li class="who"><a href="/about/">Who we are</a>
             <ul>
               <li><a href="/sponsors/">Sponsors</a></li>
               <li><a href="/sustainer/">Sustainers</a></li>
@@ -86,14 +86,17 @@
               <li><a href="/about/staff/">Staff</a></li>
               <li><a href="/about/eval-committee/">Evaluation Committee</a></li>
               <li><a href="/about/outside/">Outside Counsel, et alia</a></li>
+              <li><a href="#fixme">Transparency</a></li>
+              <li><a href="/about/contact/">Contact</a></li>
             </ul>
           </li>
           <li class="learn"><a href="#fixme">Learn</a>
             <ul>
               <li><a href="/copyleft-compliance/glossary.html">Glossary of Terms</a></li>
-              <li><a href="#fixme">Q&A</a></li>
+              <li><a href="/press/qanda.html">Q&A</a></li>
               <li><a href="#fixme">Recommended Resources</a></li>
               <li><a href="#fixme">In The News</a></li>
+              <li><a href="/about/filings/">Public Filings</a></li>
             </ul>
           </li>
           <li class="news"><a href="/news/">News</a>
@@ -104,14 +107,6 @@
               <li><a href="/press/">Press</a></li>
             </ul>
           </li>
-          <li class="about"><a href="/about/">About</a>
-            <ul>
-              <li><a href="#fixme">Who we are</a></li>
-              <li><a href="#fixme">Transparency</a></li>
-              <li><a href="/about/filings/">Public Filings</a></li>
-              <li><a href="/about/contact/">Contact</a></li>
-            </ul>
-          </li>
         </ul>
       </div>
       <div id="navbar-clear"></div>