diff --git a/b2-include/b2.css b/b2-include/b2.css
index 23e8993dfb..c8295cee56 100644
--- a/b2-include/b2.css
+++ b/b2-include/b2.css
@@ -1,3 +1,48 @@
+#wphead {
+	margin: 5px;
+	background-image: url(http://wordpress.org/images/wp-small.png);
+	background-repeat: no-repeat;
+	height: 42px;
+	border-bottom: 4px solid #333;
+}
+#wphead a {
+	display: block;
+	height: 30px;
+}
+#wphead a span {
+	display: none;
+}
+
+#adminmenu {
+	list-style: none outside;
+	padding: 0;
+	margin: 5px 0 0 0;
+	margin-left: 40px;
+	height: 100%;
+}
+
+#adminmenu li {
+	text-align: center;
+	display: block;
+	float: left; 
+	padding: 4px;
+	border-right: 1px solid #ccc;
+}
+#adminmenu #last {
+	border-right: none;
+}
+#adminmenu a {
+	padding: 3px 8px 3px 7px;
+	color: #333;
+	text-decoration: none;
+	border: 1px solid white;
+}
+#adminmenu a:hover {
+	background-color: #e9e9e9;
+	color: #333;
+	border: 1px solid gray;
+}
+
 body	{
 	margin-top: 0px;
 	margin-left: 0px;
@@ -6,19 +51,18 @@ body	{
     background-color: #FFFFFF}
 body, td {
 	color: #000000; 
-	font-family: Verdana, Geneva, Arial, Helvetica;
+	font-family: Georgia, "Times New Roman", Times, serif;
 	font-size: 10pt;
 }
 a {
-	background-color: transparent; 
-	color: #0000FF;
-	text-decoration: none;
+	color: #00019b;
 	font-weight: bold;
 }
+a:visited {
+	color: #006;
+}
 a:hover {
-	color: #FF3300;
-	text-decoration: underline;
-	font-weight: bold;
+	color: #069;
 }
 
 .panelbody {
@@ -27,34 +71,24 @@ a:hover {
 }
 .table {
 	color: #000000; 
-	font-family: Verdana, Geneva, Arial, Helvetica;
 	font-size: 10pt;
 }
 .tabletoprow {
 	background-color: #ffffff;
 	color: #000000; 
-	font-family: Verdana, Geneva, Arial, Helvetica;
 	font-size: 12px;
 	font-style: italic;
 }
-.search {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000066;
-	background-color: #ffeecc;
-	background-image: url("../b2-img/b2button.gif");
-}
-.quicktags {
-	font-family: Arial, Helvetica, sans-serif;
+
+.quicktags, .search {
+	font-family: Georgia, "Times New Roman", Times, serif;
 	font-size: 12px;
 	color: #000000;
 	background-color: #cccccc;
-	background-image: url("../b2-img/b2button2.gif");
 }
 
 .menutop {
 	color: #999999;
-	font-family: Verdana, Geneva, Arial, Helvetica;
 	font-size: 10px;
 	background-color: #DDEEFF;
 }
@@ -71,7 +105,6 @@ a.menutop:hover {
 }
 
 .menutoptitle {
-	font-family: Arial, Verdana, Geneva, Arial, Helvetica;
 	color: #BBCCDD;
 	font-size: 14px;
 	font-weight: bold;
@@ -79,7 +112,6 @@ a.menutop:hover {
 
 .b2menutop { 
 	color: #333333; 
-	font-family: Verdana, Geneva, Arial, Helvetica;
 	font-size: 10px;
 }
 a.b2menutop {
@@ -93,7 +125,6 @@ a.b2menutop:hover {
 	text-decoration: none;
 }
 xmp { /* Just in case */
-	font-family: Verdana, Geneva, Arial, Helvetica;
 	font-size: 10pt;
 }
 form { margin: 0; padding: 0; } /* thanks #mozilla */
\ No newline at end of file
diff --git a/b2-include/b2menutop.php b/b2-include/b2menutop.php
index 8771d93f5a..86cc0ba110 100644
--- a/b2-include/b2menutop.php
+++ b/b2-include/b2menutop.php
@@ -1,31 +1,9 @@
-<img src="b2-img/blank.gif" width="1" height="5" alt="" border="0" />
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr height="15">
-
-<td height="15" width="20"><img src="b2-img/blank.gif" width="1" height="1" alt="" /></td>
-
-<td rowspan="3" width="50" valign="top"><a href="http://cafelog.com/"><img src="b2-img/b2minilogo.png" width="50" height="50" border="0" alt="visit b2's website" style="border-width:1px; border-color: #999999; border-style: dashed" /></a></td>
-
-<td><img src="b2-img/blank.gif" width="1" height="1" alt="" /></td>
-<td width="150" style="text-align: right; padding-rightt: 6px;">
-<span style="color: #b0b0b0; font-family: verdana, arial, helvetica; font-size: 10px;">logged in as : <b><?php echo $user_login; ?></b></span>
-</td>
-
-</tr>
-<tr>
-
-<td class="menutop" width="20">&nbsp;
-</td>
-
-<td class="menutop"<?php if ($is_NS4) { echo " width=\"500\""; } ?>>
-<div class="menutop"<?php if ($is_NS4) { echo " width=\"500\""; } ?>>
-
-
-<?php if ($is_NS4) { echo $HTTP_USER_AGENT; } ?>
-
-
-<?php $sep = "&nbsp;&nbsp;|&nbsp;&nbsp;"; ?>
-&nbsp;<a href="b2edit.php" class="menutop" style="-font-weight: bold;">Post / Edit</a><?php echo $sep ?><a href="javascript:profile(<?php echo $user_ID ?>)" class="menutop">My Profile</a><?php echo $sep ?><a href="b2team.php" class="menutop">Team</a><?php
+<h1 id="wphead"><a href="http://wordpress.org" rel="external"><span>WordPress</span></a></h1> 
+<ul id="adminmenu">
+  <li><a href="b2edit.php"><strong>Post / Edit</strong></a></li>
+  <li><a href="javascript:profile(<?php echo $user_ID ?>)">My Profile</a></li>
+  <li><a href="b2team.php">Team</a></li>
+    <?php
 
 if ($pagenow != "b2profile.php") {
 
@@ -35,7 +13,7 @@ $j=$menu[0];
 while ($j != "") {
 	$k = explode("\t",$j);
 	if ($user_level >= $k[0]) {
-		echo "$sep<a href=\"".$k[1]."\" class=\"menutop\">".trim($k[2])."</a>";
+		echo "\n<li><a href='".$k[1]."'>".trim($k[2]).'</a></li>';
 	}
 	$i=$i+1;
 	$j=$menu[$i];
@@ -45,23 +23,8 @@ while ($j != "") {
 
 }
 ?>
+<li><a href="<?php echo $siteurl."/".$blogfilename; ?>">View site</a></li>
+<li><a href="b2login.php?action=logout">Logout</a></li>
+</ul>
 
-</div>
-</td>
-
-<td width="150" class="menutop" align="right" bgcolor="#FF9900">
-<a href="<?php echo $siteurl."/".$blogfilename; ?>" class="menutop">View site</a>
-<?php echo $sep; ?>
-<a href="b2login.php?action=logout" class="menutop">Logout</a>
-</td>
-
-</tr>
-<tr>
-
-<td>&nbsp;</td>
-<td style="padding-left: 6px;"><span class="menutoptitle">:: <?php echo $title; ?></span></td>
-<td>&nbsp;</td>
-
-</tr>
-
-</table>
\ No newline at end of file
+<h2><?php echo $title; ?></h2>