diff --git a/wp-admin/b2menutop.php b/wp-admin/b2menutop.php
index fb3aebc19..ba3ed22de 100644
--- a/wp-admin/b2menutop.php
+++ b/wp-admin/b2menutop.php
@@ -11,16 +11,16 @@ foreach ($menu as $item) {
 	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 (substr($PHP_SELF, -7) == substr($item[1], -7)) $class = ' class="current"';
 		if ($user_level >= $item[0]) echo "\n\t<li><a href='{$item[1]}'$class>{$item[2]}</a></li>";
 	}
 }
 
 ?>
 
-	<li><a href="javascript:profile(<?php echo $user_ID ?>)">My&nbsp;Profile</a></li>
-	<li><a href="<?php echo "$siteurl/$blogfilename"; ?>">View&nbsp;site</a></li>
-	<li class="last"><a href="<?php echo $siteurl ?>/b2login.php?action=logout">Logout&nbsp;(<?php echo stripslashes($user_nickname) ?>)</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 class="last"><a href="<?php echo $siteurl ?>/b2login.php?action=logout">Logout (<?php echo stripslashes($user_nickname) ?>)</a></li>
 </ul>
 
-<h2 id="top"><?php echo $title; ?></h2>
\ No newline at end of file
+<h2><?php echo $title; ?></h2>
\ No newline at end of file