-$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');
-if ( current_user_can('edit_users') )
- $menu[40] = array(__('Users'), 'edit_users', 'users.php');
-else
- $menu[40] = array(__('Profile'), 'read', 'profile.php');
+$menu[0] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top', 'menu-dashboard', 'div' );
+
+$menu[4] = array( '', 'read', '', '', 'wp-menu-separator' );
+
+$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'wp-menu-open menu-top', 'menu-posts', 'div' );
+ $submenu['edit.php'][5] = array( __('Edit'), 'edit_posts', 'edit.php' );
+ $submenu['edit.php'][10] = array( _c('Add New|post'), 'edit_posts', 'post-new.php' );
+ $submenu['edit.php'][15] = array( __('Tags'), 'manage_categories', 'edit-tags.php' );
+ $submenu['edit.php'][20] = array( __('Categories'), 'manage_categories', 'categories.php' );
+
+$menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top', 'menu-media', 'div' );
+ $submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
+ $submenu['upload.php'][10] = array( _c('Add New|file'), 'upload_files', 'media-new.php');
+
+$menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top', 'menu-links', 'div' );
+ $submenu['link-manager.php'][5] = array( __('Edit'), 'manage_links', 'link-manager.php' );
+ $submenu['link-manager.php'][10] = array( _c('Add New|links'), 'manage_links', 'link-add.php' );
+ $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
+
+$menu[20] = array( __('Pages'), 'edit_pages', 'edit-pages.php', '', 'menu-top', 'menu-pages', 'div' );
+ $submenu['edit-pages.php'][5] = array( __('Edit'), 'edit_pages', 'edit-pages.php' );
+ $submenu['edit-pages.php'][10] = array( _c('Add New|page'), 'edit_pages', 'page-new.php' );
+
+$menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top', 'menu-comments', 'div' );