diff --git a/wp-admin/b2.css b/wp-admin/b2.css
index 2c977ffda..e066a9d2a 100644
--- a/wp-admin/b2.css
+++ b/wp-admin/b2.css
@@ -12,31 +12,6 @@ a:hover {
 	color: #069;
 }
 
-a.b2menutop {
-	background-color: transparent;
-	color: #06f;
-	font-weight: lighter;
-}
-
-a.b2menutop:hover {
-	color: #f90;
-	font-weight: bold;
-	text-decoration: none;
-}
-
-a.menutop {
-	background-color: transparent;
-	border-width: 0px;
-	color: #36c;
-	font-weight: normal;
-}
-
-a.menutop:hover {
-	color: #f90;
-	font-weight: normal;
-	text-decoration: underline;
-}
-
 body	{
 	background-color: #fff;
 	margin: 0px;
@@ -68,17 +43,6 @@ p {
 	line-height: 130%;
 }
 
-td.menutop {
-	border-bottom-width: 1px;
-	border-color: #999;
-	border-left-width: 0px;
-	border-right-width: 0px;
-	border-style: dashed;
-	border-top-width: 1px;
-	padding-bottom: 2px;
-	padding-top: 2px;
-}
-
 textarea, input, select {
 	background-color: #f0f0f0;
 	border-color: #ccc;
@@ -89,15 +53,6 @@ textarea, input, select {
 	padding: 2px;
 }
 
-xmp {
-	font-size: 10pt; /* Just in case */
-}
-
-.b2menutop {
-	color: #333;
-	font-size: 10px;
-}
-
 .checkbox {
 	background-color: #fff;
 	border-width: 0px;
@@ -105,17 +60,6 @@ xmp {
 	padding: 0px;
 }
 
-.menutop {
-	background-color: #def;
-	color: #999;
-	font-size: 10px;
-}
-
-.menutoptitle {
-	color: #bcd;
-	font-size: 14px;
-	font-weight: bold;
-}
 
 .quicktags, .search {
 	background-color: #ccc;
@@ -124,18 +68,6 @@ xmp {
 	font-size: 12px;
 }
 
-.table {
-	color: #000;
-	font-size: 10pt;
-}
-
-.tabletoprow {
-	background-color: #fff;
-	color: #000;
-	font-size: 12px;
-	font-style: italic;
-}
-
 .wrap {
 	border: 1px solid #ccc;
 	margin: 20px auto 10px auto;
@@ -161,7 +93,7 @@ xmp {
 	text-decoration: none;
 }
 
-#adminmenu a:hover {
+#adminmenu a:hover, #current {
 	background-color: #e9e9e9;
 	border: 1px solid #808080;
 	color: #333;
diff --git a/wp-admin/b2menutop.php b/wp-admin/b2menutop.php
index 03626a4d2..3b935ded0 100644
--- a/wp-admin/b2menutop.php
+++ b/wp-admin/b2menutop.php
@@ -1,30 +1,25 @@
 <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") {
-
+<?php
 $menu = file("./b2menutop.txt");
-$i=0;
-$j=$menu[0];
-while ($j != "") {
-	$k = explode("\t",$j);
-	if ($user_level >= $k[0]) {
-		echo "\n<li><a href='".$k[1]."'>".trim($k[2]).'</a></li>';
+$continue = true;
+foreach ($menu as $item) {
+	$class = '';
+	$item = trim($item);
+	if ('***' == $item) $continue = false;
+	if ($continue) {
+		$item = explode("\t", $item);
+		// 0 = user level, 1 = file, 2 = name
+		if (substr($PHP_SELF, -6) == substr($item[1], -6)) $class = ' id="current"';
+		if ($user_level >= $item[0]) echo "\n\t<li><a href='{$item[1]}'$class>{$item[2]}</a></li>";
 	}
-	$i=$i+1;
-	$j=$menu[$i];
-	if (trim($j) == "***")
-		$j="";
 }
 
-}
 ?>
-<li><a href="<?php echo $siteurl."/".$blogfilename; ?>">View site</a></li>
-<li id="last"><a href="<?php echo $siteurl ?>/b2login.php?action=logout">Logout</a></li>
+
+	<li><a href="javascript:profile(<?php echo $user_ID ?>)">My Profile</a></li>
+	<li><a href="<?php echo "$siteurl/$blogfilename"; ?>">View site</a></li>
+	<li id="last"><a href="<?php echo $siteurl ?>/b2login.php?action=logout">Logout</a></li>
 </ul>
 <br clear="all" />
 
diff --git a/wp-admin/b2menutop.txt b/wp-admin/b2menutop.txt
index d9e724c61..a9460593e 100644
--- a/wp-admin/b2menutop.txt
+++ b/wp-admin/b2menutop.txt
@@ -1,7 +1,9 @@
+2	b2edit.php	Post / Edit
+3	b2team.php	Team
 3	b2options.php	Options
 3	b2categories.php	Categories
 3	b2template.php	Template
-5	linkmanager.php	Manage&nbsp;Links
+5	linkmanager.php	Manage Links
 ***
 (Everything after the '***' is a comment.)