--- wikisrc/templates/page.tmpl	2012/08/08 22:27:45	1.14
+++ wikisrc/templates/page.tmpl	2012/09/02 00:20:58	1.19
@@ -26,11 +26,11 @@
 <body>
     <div id="centralHeader">
       <div id="logo">
-        <a href="http://www.NetBSD.org/"><img src="images/NetBSD-smaller.png" alt="[NetBSD Logo]"/></a>
-        <h1><a href="http://www.NetBSD.org/">The NetBSD Project</a></h1>
-        <h2><a href="http://www.NetBSD.org/">&ldquo;Of course it runs NetBSD&rdquo;</a></h2>
+        <a href="http://www.NetBSD.org/"><img src="http://www.NetBSD.org/images/NetBSD-smaller.png" alt="[NetBSD Logo]"/></a>
+        <div id="name"><a href="http://www.NetBSD.org/">The NetBSD Project</a></div>
+        <div id="slogan"><a href="http://www.NetBSD.org/">&ldquo;Of course it runs NetBSD&rdquo;</a></div>
       </div>
-      <div class="headerTools">
+      <div id="headerTools">
 	<div id="headerSearch">
 <TMPL_IF NAME="SEARCHFORM">
 <TMPL_VAR SEARCHFORM>
@@ -39,7 +39,7 @@
       </div>
     </div>
 
-    <div class="navBar" role="navigation">
+    <div id="navBar" role="navigation">
 	<span class="doNotDisplay">
           Navigation:
         </span>
@@ -48,7 +48,7 @@
 		  Home</a></li>
 	<li>
 	<a href="http://www.NetBSD.org/">
-		  New &amp; Media</a><ul>
+		  News &amp; Media</a><ul>
 	<li><a href="http://www.NetBSD.org//changes/">
 		    Recent changes</a></li>
 	<li><a href="http://blog.NetBSD.org/">
