-$menu[5] = array(__('Write'), 'edit_posts', 'post.php');
-$menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
-$menu[20] = array(__('Links'), 'manage_links', 'link-manager.php');
-$menu[25] = array(__('Presentation'), 'switch_themes', 'themes.php');
-$menu[30] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
+
+if (strpos($_SERVER['REQUEST_URI'], 'edit-pages.php') !== false)
+ $menu[5] = array(__('Write'), 'edit_pages', 'page-new.php');
+elseif (strpos($_SERVER['REQUEST_URI'], 'link-manager.php') !== false)
+ $menu[5] = array(__('Write'), 'manage_links', 'link-add.php');
+else
+ $menu[5] = array(__('Write'), 'edit_posts', 'post-new.php');
+
+if (strpos($_SERVER['REQUEST_URI'], 'page-new.php') !== false)
+ $menu[10] = array(__('Manage'), 'edit_pages', 'edit-pages.php');
+elseif (strpos($_SERVER['REQUEST_URI'], 'link-add.php') !== false)
+ $menu[10] = array(__('Manage'), 'manage_links', 'link-manager.php');
+else
+ $menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
+
+$awaiting_mod = wp_count_comments();
+$awaiting_mod = $awaiting_mod->moderated;
+$menu[15] = array(__('Design'), 'switch_themes', 'themes.php');
+$menu[20] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php');
+$menu[30] = array(__('Settings'), 'manage_options', 'options-general.php');
+
+$update_plugins = get_option( 'update_plugins' );
+$update_count = count( $update_plugins->response );
+$menu[35] = array( sprintf( __('Plugins %s'), "<span id='update-plugins' class='count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php');