--- wikisrc/templates/page.tmpl	2020/07/27 19:50:53	1.59
+++ wikisrc/templates/page.tmpl	2020/07/30 08:49:47	1.64
@@ -43,7 +43,7 @@
     <div id="navBar" role="navigation">
         <div id="centralHeader">
           <div id="logo">
-            <a href="//www.NetBSD.org/"><img src="//www.NetBSD.org/images/NetBSD-smaller.png" alt="[NetBSD Logo]" width="90px" height="90px"/></a>
+            <a href="//www.NetBSD.org/"><img id="projectLogo" src="//www.NetBSD.org/images/NetBSD-smaller-tb.png" alt="" height="120"/></a>
           </div>
             <a href="https://netbsd.org/donations/#how-to-donate">
               <div id="fundraiser">
@@ -64,10 +64,7 @@
 		</TMPL_IF>
 	</li>
 	<li><a href="//www.NetBSD.org/">
-		  WWW Home</a></li>
-	<li>
-	<a href="//www.NetBSD.org/">
-		  News &amp; Media</a><ul>
+		  Home</a><ul>
 	<li><a href="//www.NetBSD.org//changes/">
 		    Recent changes</a></li>
 	<li><a href="//blog.NetBSD.org/">
@@ -79,12 +76,14 @@
 	<li>
 	<a href="//www.NetBSD.org/about/">
 		  About</a><ul>
-	<li><a href="//www.NetBSD.org/about/">
-		    NetBSD</a></li>
 	<li><a href="//www.NetBSD.org/people/developers.html">
-		    NetBSD developers</a></li>
+		    Developers</a></li>
 	<li><a href="//www.NetBSD.org/gallery/">
 		    Gallery</a></li>
+	<li><a href="//wiki.NetBSD.org/ports/">
+		    Ports</a></li>
+	<li><a href="http://pkgsrc.se/">
+		    Packages</a></li>
 	</ul>
 	</li>
 	<li>
@@ -103,30 +102,21 @@
 	<li>
 	<a href="//www.NetBSD.org/support/">
 		  Support</a><ul>
+	<li><a href="//wiki.NetBSD.org/community/">
+		    Community</a></li>
 	<li><a href="//www.NetBSD.org/support/send-pr.html">
-		    Problem report guide</a></li>
-	<li><a href="//www.NetBSD.org/cgi-bin/sendpr.cgi?gndb=netbsd">
-		    Report a bug</a></li>
-	<li><a href="//www.NetBSD.org/support/query-pr.html">
-		    Query bug database</a></li>
+		    Bug reports</a></li>
 	<li><a href="//www.NetBSD.org/support/security/">
 		    Security</a></li>
 	</ul>
 	</li>
 	<li>
-	<a href="//www.NetBSD.org/community/">
-		  Community</a><ul>
-	<li><a href="//www.NetBSD.org/mailinglists/">
-		    Mailing lists</a></li>
-	<li><a href="//mail-index.NetBSD.org/">
-		    List archives</a></li>
-	</ul>
-	</li>
-	<li>
 	<a href="//www.NetBSD.org/developers/">
 		  Developers</a><ul>
 	<li><a href="http://cvsweb.NetBSD.org/">
-		    Browse source</a></li>
+		    CVSWeb</a></li>
+	<li><a href="//anonhg.NetBSD.org/">
+		    Mercurial</a></li>
 	<li><a href="//nxr.NetBSD.org/">
 		    Cross-reference</a></li>
 	<li><a href="//releng.NetBSD.org/">
@@ -135,53 +125,6 @@
 		    Projects list</a></li>
 	</ul>
 	</li>
-	<li>
-	<a href="//www.NetBSD.org/ports/">
-		  Ports</a><ul>
-	<li><a href="//www.NetBSD.org/ports/history.html">
-		    History</a></li>
-	<li><a href="//www.NetBSD.org/ports/emulators.html">
-		    Emulators</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="//www.pkgsrc.org/">
-		Packages</a><ul>
-	<li><a href="http://www.pkgsrc.se/">
-		    Browse packages</a></li>
-	<li><a href="//releng.NetBSD.org/index-pkgsrc.html">
-		    Release engineering</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="<TMPL_VAR BASEURL>">
-		Wiki</a><ul>
-		<TMPL_IF NAME="HAVE_ACTIONS">
-			<TMPL_IF NAME="EDITURL">
-			<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">
-				    Edit</a></li>
-			</TMPL_IF>
-			<TMPL_IF NAME="COMMENTSLINK">
-			<li><TMPL_VAR COMMENTSLINK></li>
-			</TMPL_IF>
-			<TMPL_IF NAME="GETSOURCEURL">
-			<li><a href="<TMPL_VAR GETSOURCEURL>">
-				    Source</a></li>
-			</TMPL_IF>
-			<TMPL_IF NAME="HISTORYURL">
-			<li><a href="<TMPL_VAR HISTORYURL>">
-				    History</a></li>
-			</TMPL_IF>
-			<li><a href="<TMPL_VAR BASEURL>wiki/new_page" rel="nofollow">
-				    New</a></li>
-			<TMPL_IF NAME="RECENTCHANGESURL">
-			<li><a href="<TMPL_VAR RECENTCHANGESURL>">
-				    Recent Changes</a></li>
-			</TMPL_IF>
-		</TMPL_IF>
-	</ul>
-	</li>
-	</ul>
     </div>
 
 <TMPL_IF SIDEBAR>
@@ -190,6 +133,33 @@
 </div>
 </TMPL_IF>
 
+<div class="actions"><ul>
+	<TMPL_IF NAME="HAVE_ACTIONS">
+		<TMPL_IF NAME="EDITURL">
+		<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">
+			    Edit</a></li>
+		</TMPL_IF>
+		<TMPL_IF NAME="COMMENTSLINK">
+		<li><TMPL_VAR COMMENTSLINK></li>
+		</TMPL_IF>
+		<TMPL_IF NAME="GETSOURCEURL">
+		<li><a href="<TMPL_VAR GETSOURCEURL>">
+			    Source</a></li>
+		</TMPL_IF>
+		<TMPL_IF NAME="HISTORYURL">
+		<li><a href="<TMPL_VAR HISTORYURL>">
+			    History</a></li>
+		</TMPL_IF>
+		<li><a href="<TMPL_VAR BASEURL>wiki/new_page" rel="nofollow">
+			    New</a></li>
+		<TMPL_IF NAME="RECENTCHANGESURL">
+		<li><a href="<TMPL_VAR RECENTCHANGESURL>">
+			    Recent Changes</a></li>
+		</TMPL_IF>
+	</TMPL_IF>
+</ul></div>
+
+
 <div id="content">
 
 <div class="pageheader">