diff --git a/e107_admin/ad_links.php b/e107_admin/ad_links.php
index 52ee6425b..d6bd13da2 100644
--- a/e107_admin/ad_links.php
+++ b/e107_admin/ad_links.php
@@ -9,8 +9,8 @@
  * Admin Navigation
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/ad_links.php,v $
- * $Revision: 1.7 $
- * $Date: 2008-12-02 00:32:30 $
+ * $Revision: 1.8 $
+ * $Date: 2009-01-09 17:25:50 $
  * $Author: secretr $
 */
 
@@ -39,34 +39,42 @@ if (!defined('E_16_CAT_TOOL')) {
 if (!defined('E_16_CAT_PLUG')) {
 	define('E_16_CAT_PLUG', e_IMAGE.'admin_images/cat_plugins_16.png');
 }
+if (!defined('E_16_CAT_ABOUT')) {
+	define('E_16_CAT_ABOUT', e_IMAGE.'admin_images/info_16.png');
+}
 
 // Large Category Images
 if (!defined('E_32_CAT_SETT')) {
-	define('E_32_CAT_SETT', "<img src='".e_IMAGE."admin_images/cat_settings_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CAT_SETT', "<img class='icon S32' src='".e_IMAGE."admin_images/cat_settings_32.png' alt='' />");
 }
 if (!defined('E_32_CAT_USER')) {
-	define('E_32_CAT_USER', "<img src='".e_IMAGE."admin_images/cat_users_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CAT_USER', "<img class='icon S32' src='".e_IMAGE."admin_images/cat_users_32.png' alt='' />");
 }
 if (!defined('E_32_CAT_CONT')) {
-	define('E_32_CAT_CONT', "<img src='".e_IMAGE."admin_images/cat_content_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CAT_CONT', "<img class='icon S32' src='".e_IMAGE."admin_images/cat_content_32.png' alt='' />");
 }
 if (!defined('E_32_CAT_FILE')) {
-	define('E_32_CAT_FILE', "<img src='".e_IMAGE."admin_images/cat_files_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CAT_FILE', "<img class='icon S32' src='".e_IMAGE."admin_images/cat_files_32.png' alt='' />");
 }
 if (!defined('E_32_CAT_TOOL')) {
-	define('E_32_CAT_TOOL', "<img src='".e_IMAGE."admin_images/cat_tools_32.png' alt='' style='border:0px; width:32px; height:32px' />");
+	define('E_32_CAT_TOOL', "<img class='icon S32' src='".e_IMAGE."admin_images/cat_tools_32.png' alt='' />");
 }
 if (!defined('E_32_CAT_PLUG')) {
-	define('E_32_CAT_PLUG', "<img src='".e_IMAGE."admin_images/cat_plugins_32.png' alt='' style='border:0px; width:32px; height:32px' />");
+	define('E_32_CAT_PLUG', "<img class='icon S32' src='".e_IMAGE."admin_images/cat_plugins_32.png' alt='' />");
+}
+if (!defined('E_32_CAT_ABOUT')) {
+	define('E_32_CAT_ABOUT', "<img class='icon S32' src='".e_IMAGE."admin_images/info_32.png' alt='' />");
 }
 
 // Small Nav Images
 if (!defined('E_16_NAV_MAIN')) {
 	define('E_16_NAV_MAIN', e_IMAGE.'admin_images/main_16.png');
 }
+/*
 if (!defined('E_16_NAV_DOCS')) {
 	define('E_16_NAV_DOCS', e_IMAGE.'admin_images/docs_16.png');
 }
+*/
 if (!defined('E_16_NAV_LEAV')) {
 	define('E_16_NAV_LEAV', e_IMAGE.'admin_images/leave_16.png');
 }
@@ -82,288 +90,315 @@ if (!defined('E_16_NAV_ARROW_OVER')) {
 
 // Large Nav Images
 if (!defined('E_32_NAV_MAIN')) {
-	define('E_32_NAV_MAIN', "<img src='".e_IMAGE."admin_images/main_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_MAIN', "<img class='icon S32' src='".e_IMAGE."admin_images/main_32.png' alt='' />");
 }
 if (!defined('E_32_NAV_DOCS')) {
-	define('E_32_NAV_DOCS', "<img src='".e_IMAGE."admin_images/docs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_DOCS', "<img class='icon S32' src='".e_IMAGE."admin_images/docs_32.png' alt='' />");
 }
 if (!defined('E_32_NAV_LEAV')) {
-	define('E_32_NAV_LEAV', "<img src='".e_IMAGE."admin_images/leave_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_LEAV', "<img class='icon S32' src='".e_IMAGE."admin_images/leave_32.png' alt='' />");
 }
 if (!defined('E_32_NAV_LGOT')) {
-	define('E_32_NAV_LGOT', "<img src='".e_IMAGE."admin_images/logout_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_LGOT', "<img class='icon S32' src='".e_IMAGE."admin_images/logout_32.png' alt='' />");
 }
 if (!defined('E_32_NAV_ARROW')) {
-	define('E_32_NAV_ARROW', "<img src='".e_IMAGE."admin_images/arrow_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_ARROW', "<img class='icon S32' src='".e_IMAGE."admin_images/arrow_32.png' alt='' />");
 }
 if (!defined('E_32_NAV_ARROW_OVER')) {
-	define('E_32_NAV_ARROW_OVER', "<img src='".e_IMAGE."admin_images/arrow_over_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_ARROW_OVER', "<img class='icon S32' src='".e_IMAGE."admin_images/arrow_over_32.png' alt='' />");
 }
 
 // Small Admin Main Link Images
 if (!defined('E_16_ADMIN')) {
-	define('E_16_ADMIN', "<img src='".e_IMAGE."admin_images/admins_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_ADMIN', "<img class='icon S16' src='".e_IMAGE."admin_images/admins_16.png' alt='' />");
 }
 if (!defined('E_16_ADPASS')) {
-	define('E_16_ADPASS', "<img src='".e_IMAGE."admin_images/adminpass_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_ADPASS', "<img class='icon S16' src='".e_IMAGE."admin_images/adminpass_16.png' alt='' />");
 }
 if (!defined('E_16_BANLIST')) {
-	define('E_16_BANLIST', "<img src='".e_IMAGE."admin_images/banlist_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_BANLIST', "<img class='icon S16' src='".e_IMAGE."admin_images/banlist_16.png' alt='' />");
 }
 if (!defined('E_16_BANNER')) {
-	define('E_16_BANNER', "<img src='".e_IMAGE."admin_images/banners_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_BANNER', "<img class='icon S16' src='".e_IMAGE."admin_images/banners_16.png' alt='' />");
 }
 if (!defined('E_16_CACHE')) {
-	define('E_16_CACHE', "<img src='".e_IMAGE."admin_images/cache_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_CACHE', "<img class='icon S16' src='".e_IMAGE."admin_images/cache_16.png' alt='' />");
 }
 if (!defined('E_16_CREDITS')) {
-	define('E_16_CREDITS', "<img src='".e_IMAGE."admin_images/credits_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_CREDITS', "<img class='icon S16' src='".e_IMAGE."admin_images/credits_16.png' alt='' />");
 }
 if (!defined('E_16_CRON')) {
-	define('E_16_CRON', "<img src='".e_IMAGE."admin_images/cron_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_CRON', "<img class='icon S16' src='".e_IMAGE."admin_images/cron_16.png' alt='' />");
 }
 if (!defined('E_16_CUST')) {
-	define('E_16_CUST', "<img src='".e_IMAGE."admin_images/custom_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_CUST', "<img class='icon S16' src='".e_IMAGE."admin_images/custom_16.png' alt='' />");
 }
 if (!defined('E_16_DATAB')) {
-	define('E_16_DATAB', "<img src='".e_IMAGE."admin_images/database_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_DATAB', "<img class='icon S16' src='".e_IMAGE."admin_images/database_16.png' alt='' />");
+}
+if (!defined('E_16_DOCS')) {
+	define('E_16_DOCS', "<img class='icon S16' src='".e_IMAGE."admin_images/docs_16.png' alt='' />");
 }
 if (!defined('E_16_DOWNL')) {
-	define('E_16_DOWNL', "<img src='".e_IMAGE."admin_images/downloads_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_DOWNL', "<img class='icon S16' src='".e_IMAGE."admin_images/downloads_16.png' alt='' />");
 }
 if (!defined('E_16_EMOTE')) {
-	define('E_16_EMOTE', "<img src='".e_IMAGE."admin_images/emoticons_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_EMOTE', "<img class='icon S16' src='".e_IMAGE."admin_images/emoticons_16.png' alt='' />");
 }
 if (!defined('E_16_FILE')) {
-	define('E_16_FILE', "<img src='".e_IMAGE."admin_images/filemanager_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_FILE', "<img class='icon S16' src='".e_IMAGE."admin_images/filemanager_16.png' alt='' />");
 }
 if (!defined('E_16_FORUM')) {
-	define('E_16_FORUM', "<img src='".e_IMAGE."admin_images/forums_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_FORUM', "<img class='icon S16' src='".e_IMAGE."admin_images/forums_16.png' alt='' />");
 }
 if (!defined('E_16_FRONT')) {
-	define('E_16_FRONT', "<img src='".e_IMAGE."admin_images/frontpage_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_FRONT', "<img class='icon S16' src='".e_IMAGE."admin_images/frontpage_16.png' alt='' />");
 }
 if (!defined('E_16_IMAGES')) {
-	define('E_16_IMAGES', "<img src='".e_IMAGE."admin_images/images_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_IMAGES', "<img class='icon S16' src='".e_IMAGE."admin_images/images_16.png' alt='' />");
 }
 if (!defined('E_16_INSPECT')) {
-	define('E_16_INSPECT', "<img src='".e_IMAGE."admin_images/fileinspector_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_INSPECT', "<img class='icon S16' src='".e_IMAGE."admin_images/fileinspector_16.png' alt='' />");
 }
 if (!defined('E_16_LINKS')) {
-	define('E_16_LINKS', "<img src='".e_IMAGE."admin_images/links_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_LINKS', "<img class='icon S16' src='".e_IMAGE."admin_images/links_16.png' alt='' />");
 }
 if (!defined('E_16_WELCOME')) {
-	define('E_16_WELCOME', "<img src='".e_IMAGE."admin_images/welcome_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_WELCOME', "<img class='icon S16' src='".e_IMAGE."admin_images/welcome_16.png' alt='' />");
 }
 if (!defined('E_16_MAIL')) {
-	define('E_16_MAIL', "<img src='".e_IMAGE."admin_images/mail_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_MAIL', "<img class='icon S16' src='".e_IMAGE."admin_images/mail_16.png' alt='' />");
 }
 if (!defined('E_16_MAINTAIN')) {
-	define('E_16_MAINTAIN', "<img src='".e_IMAGE."admin_images/maintain_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_MAINTAIN', "<img class='icon S16' src='".e_IMAGE."admin_images/maintain_16.png' alt='' />");
 }
 if (!defined('E_16_MENUS')) {
-	define('E_16_MENUS', "<img src='".e_IMAGE."admin_images/menus_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_MENUS', "<img class='icon S16' src='".e_IMAGE."admin_images/menus_16.png' alt='' />");
 }
 if (!defined('E_16_META')) {
-	define('E_16_META', "<img src='".e_IMAGE."admin_images/meta_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_META', "<img class='icon S16' src='".e_IMAGE."admin_images/meta_16.png' alt='' />");
 }
 if (!defined('E_16_NEWS')) {
-	define('E_16_NEWS', "<img src='".e_IMAGE."admin_images/news_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_NEWS', "<img class='icon S16' src='".e_IMAGE."admin_images/news_16.png' alt='' />");
 }
 if (!defined('E_16_NEWSFEED')) {
-	define('E_16_NEWSFEED', "<img src='".e_IMAGE."admin_images/newsfeeds_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_NEWSFEED', "<img class='icon S16' src='".e_IMAGE."admin_images/newsfeeds_16.png' alt='' />");
 }
 if (!defined('E_16_NOTIFY')) {
-	define('E_16_NOTIFY', "<img src='".e_IMAGE."admin_images/notify_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_NOTIFY', "<img class='icon S16' src='".e_IMAGE."admin_images/notify_16.png' alt='' />");
 }
 if (!defined('E_16_PHP')) {
-	define('E_16_PHP', "<img src='".e_IMAGE."admin_images/phpinfo_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_PHP', "<img class='icon S16' src='".e_IMAGE."admin_images/phpinfo_16.png' alt='' />");
 }
 if (!defined('E_16_POLLS')) {
-	define('E_16_POLLS', "<img src='".e_IMAGE."admin_images/polls_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_POLLS', "<img class='icon S16' src='".e_IMAGE."admin_images/polls_16.png' alt='' />");
 }
 if (!defined('E_16_PREFS')) {
-	define('E_16_PREFS', "<img src='".e_IMAGE."admin_images/prefs_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_PREFS', "<img class='icon S16' src='".e_IMAGE."admin_images/prefs_16.png' alt='' />");
 }
 if (!defined('E_16_SEARCH')) {
-	define('E_16_SEARCH', "<img src='".e_IMAGE."admin_images/search_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_SEARCH', "<img class='icon S16' src='".e_IMAGE."admin_images/search_16.png' alt='' />");
 }
 if (!defined('E_16_UPLOADS')) {
-	define('E_16_UPLOADS', "<img src='".e_IMAGE."admin_images/uploads_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_UPLOADS', "<img class='icon S16' src='".e_IMAGE."admin_images/uploads_16.png' alt='' />");
 }
 if (!defined('E_16_EURL')) {
-	define('E_16_EURL', "<img src='".e_IMAGE."admin_images/eurl_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_EURL', "<img class='icon S16' src='".e_IMAGE."admin_images/eurl_16.png' alt='' />");
 }
 if (!defined('E_16_USER')) {
-	define('E_16_USER', "<img src='".e_IMAGE."admin_images/users_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_USER', "<img class='icon S16' src='".e_IMAGE."admin_images/users_16.png' alt='' />");
 }
 if (!defined('E_16_USER_EXTENDED')) {
-	define('E_16_USER_EXTENDED', "<img src='".e_IMAGE."admin_images/extended_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_USER_EXTENDED', "<img class='icon S16' src='".e_IMAGE."admin_images/extended_16.png' alt='' />");
 }
 if (!defined('E_16_USERCLASS')) {
-	define('E_16_USERCLASS', "<img src='".e_IMAGE."admin_images/userclass_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_USERCLASS', "<img class='icon S16' src='".e_IMAGE."admin_images/userclass_16.png' alt='' />");
 }
 if (!defined('E_16_LANGUAGE')) {
-	define('E_16_LANGUAGE', "<img src='".e_IMAGE."admin_images/language_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_LANGUAGE', "<img class='icon S16' src='".e_IMAGE."admin_images/language_16.png' alt='' />");
 }
 
 // Small Admin Other Link Images
 if (!defined('E_16_PLUGIN')) {
-	define('E_16_PLUGIN', "<img src='".e_IMAGE."admin_images/plugins_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_PLUGIN', "<img class='icon S16' src='".e_IMAGE."admin_images/plugins_16.png' alt='' />");
 }
 if (!defined('E_16_PLUGMANAGER')) {
-	define('E_16_PLUGMANAGER', "<img src='".e_IMAGE."admin_images/plugmanager_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_PLUGMANAGER', "<img class='icon S16' src='".e_IMAGE."admin_images/plugmanager_16.png' alt='' />");
 }
 if (!defined('E_16_DOCS')) {
-	define('E_16_DOCS', "<img src='".e_IMAGE."admin_images/docs_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_DOCS', "<img class='icon S16' src='".e_IMAGE."admin_images/docs_16.png' alt='' />");
 }
 if (!defined('E_16_THEMEMANAGER')) {
-	define('E_16_THEMEMANAGER', "<img src='".e_IMAGE."admin_images/themes_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_THEMEMANAGER', "<img class='icon S16' src='".e_IMAGE."admin_images/themes_16.png' alt='' />");
 }
 
 // Small Admin Other Images
 if (!defined('E_16_COMMENT')) {
-	define('E_16_COMMENT', "<img src='".e_IMAGE."admin_images/comments_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_COMMENT', "<img class='icon S16' src='".e_IMAGE."admin_images/comments_16.png' alt='' />");
 }
 if (!defined('E_16_ADMINLOG')) {
-	define('E_16_ADMINLOG', "<img src='".e_IMAGE."admin_images/adminlogs_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_ADMINLOG', "<img class='icon S16' src='".e_IMAGE."admin_images/adminlogs_16.png' alt='' />");
 }
 
+if (!defined('E_16_MANAGE')) {
+	define('E_16_MANAGE', "<img class='icon S16' src='".e_IMAGE."admin_images/manage_16.png' alt='' />");
+}
+
+if (!defined('E_16_CREATE')) {
+	define('E_16_CREATE', "<img class='icon S16' src='".e_IMAGE."admin_images/add_16.png' alt='' />");
+}
+
+if (!defined('E_16_SETTINGS')) {
+	define('E_16_SETTINGS', "<img class='icon S16' src='".e_IMAGE."admin_images/settings_16.png' alt='' />");
+}
+
+
 // Large Admin Main Link Images
 if (!defined('E_32_ADMIN')) {
-	define('E_32_ADMIN', "<img src='".e_IMAGE."admin_images/admins_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_ADMIN', "<img class='icon S32' src='".e_IMAGE."admin_images/admins_32.png' alt='' />");
 }
 if (!defined('E_32_ADPASS')) {
-	define('E_32_ADPASS', "<img src='".e_IMAGE."admin_images/adminpass_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_ADPASS', "<img class='icon S32' src='".e_IMAGE."admin_images/adminpass_32.png' alt='' />");
 }
 if (!defined('E_32_BANLIST')) {
-	define('E_32_BANLIST', "<img src='".e_IMAGE."admin_images/banlist_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_BANLIST', "<img class='icon S32' src='".e_IMAGE."admin_images/banlist_32.png' alt='' />");
 }
 if (!defined('E_32_BANNER')) {
-	define('E_32_BANNER', "<img src='".e_IMAGE."admin_images/banners_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_BANNER', "<img class='icon S32' src='".e_IMAGE."admin_images/banners_32.png' alt='' />");
 }
 if (!defined('E_32_CACHE')) {
-	define('E_32_CACHE', "<img src='".e_IMAGE."admin_images/cache_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CACHE', "<img class='icon S32' src='".e_IMAGE."admin_images/cache_32.png' alt='' />");
 }
 if (!defined('E_32_CREDITS')) {
-	define('E_32_CREDITS', "<img src='".e_IMAGE."admin_images/credits_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CREDITS', "<img class='icon S32' src='".e_IMAGE."admin_images/credits_32.png' alt='' />");
 }
 if (!defined('E_32_CRON')) {
-	define('E_32_CRON', "<img src='".e_IMAGE."admin_images/cron_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CRON', "<img class='icon S32' src='".e_IMAGE."admin_images/cron_32.png' alt='' />");
 }
-
 if (!defined('E_32_CUST')) {
-	define('E_32_CUST', "<img src='".e_IMAGE."admin_images/custom_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CUST', "<img class='icon S32' src='".e_IMAGE."admin_images/custom_32.png' alt='' />");
 }
 if (!defined('E_32_DATAB')) {
-	define('E_32_DATAB', "<img src='".e_IMAGE."admin_images/database_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_DATAB', "<img class='icon S32' src='".e_IMAGE."admin_images/database_32.png' alt='' />");
+}
+if (!defined('E_32_DOCS')) {
+	define('E_32_DOCS', "<img class='icon S32' src='".e_IMAGE."admin_images/docs_32.png' alt='' />");
 }
 if (!defined('E_32_DOWNL')) {
-	define('E_32_DOWNL', "<img src='".e_IMAGE."admin_images/downloads_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_DOWNL', "<img class='icon S32' src='".e_IMAGE."admin_images/downloads_32.png' alt='' />");
 }
 if (!defined('E_32_EMOTE')) {
-	define('E_32_EMOTE', "<img src='".e_IMAGE."admin_images/emoticons_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_EMOTE', "<img class='icon S32' src='".e_IMAGE."admin_images/emoticons_32.png' alt='' />");
 }
 if (!defined('E_32_FILE')) {
-	define('E_32_FILE', "<img src='".e_IMAGE."admin_images/filemanager_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_FILE', "<img class='icon S32' src='".e_IMAGE."admin_images/filemanager_32.png' alt='' />");
 }
 if (!defined('E_32_FORUM')) {
-	define('E_32_FORUM', "<img src='".e_IMAGE."admin_images/forums_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_FORUM', "<img class='icon S32' src='".e_IMAGE."admin_images/forums_32.png' alt='' />");
 }
 if (!defined('E_32_FRONT')) {
-	define('E_32_FRONT', "<img src='".e_IMAGE."admin_images/frontpage_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_FRONT', "<img class='icon S32' src='".e_IMAGE."admin_images/frontpage_32.png' alt='' />");
 }
 if (!defined('E_32_IMAGES')) {
-	define('E_32_IMAGES', "<img src='".e_IMAGE."admin_images/images_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_IMAGES', "<img class='icon S32' src='".e_IMAGE."admin_images/images_32.png' alt='' />");
 }
 if (!defined('E_32_INSPECT')) {
-	define('E_32_INSPECT', "<img src='".e_IMAGE."admin_images/fileinspector_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_INSPECT', "<img class='icon S32' src='".e_IMAGE."admin_images/fileinspector_32.png' alt='' />");
 }
 if (!defined('E_32_LINKS')) {
-	define('E_32_LINKS', "<img src='".e_IMAGE."admin_images/links_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_LINKS', "<img class='icon S32' src='".e_IMAGE."admin_images/links_32.png' alt='' />");
 }
 if (!defined('E_32_WELCOME')) {
-	define('E_32_WELCOME', "<img src='".e_IMAGE."admin_images/welcome_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_WELCOME', "<img class='icon S32' src='".e_IMAGE."admin_images/welcome_32.png' alt='' />");
 }
 if (!defined('E_32_MAIL')) {
-	define('E_32_MAIL', "<img src='".e_IMAGE."admin_images/mail_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_MAIL', "<img class='icon S32' src='".e_IMAGE."admin_images/mail_32.png' alt='' />");
 }
 if (!defined('E_32_MAINTAIN')) {
-	define('E_32_MAINTAIN', "<img src='".e_IMAGE."admin_images/maintain_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_MAINTAIN', "<img class='icon S32' src='".e_IMAGE."admin_images/maintain_32.png' alt='' />");
 }
 if (!defined('E_32_MENUS')) {
-	define('E_32_MENUS', "<img src='".e_IMAGE."admin_images/menus_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_MENUS', "<img class='icon S32' src='".e_IMAGE."admin_images/menus_32.png' alt='' />");
 }
 if (!defined('E_32_META')) {
-	define('E_32_META', "<img src='".e_IMAGE."admin_images/meta_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_META', "<img class='icon S32' src='".e_IMAGE."admin_images/meta_32.png' alt='' />");
 }
 if (!defined('E_32_NEWS')) {
-	define('E_32_NEWS', "<img src='".e_IMAGE."admin_images/news_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NEWS', "<img class='icon S32' src='".e_IMAGE."admin_images/news_32.png' alt='' />");
 }
 if (!defined('E_32_NEWSFEED')) {
-	define('E_32_NEWSFEED', "<img src='".e_IMAGE."admin_images/newsfeeds_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NEWSFEED', "<img class='icon S32' src='".e_IMAGE."admin_images/newsfeeds_32.png' alt='' />");
 }
 if (!defined('E_32_NOTIFY')) {
-	define('E_32_NOTIFY', "<img src='".e_IMAGE."admin_images/notify_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NOTIFY', "<img class='icon S32' src='".e_IMAGE."admin_images/notify_32.png' alt='' />");
 }
 if (!defined('E_32_PHP')) {
-	define('E_32_PHP', "<img src='".e_IMAGE."admin_images/phpinfo_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_PHP', "<img class='icon S32' src='".e_IMAGE."admin_images/phpinfo_32.png' alt='' />");
 }
 if (!defined('E_32_POLLS')) {
-	define('E_32_POLLS', "<img src='".e_IMAGE."admin_images/polls_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_POLLS', "<img class='icon S32' src='".e_IMAGE."admin_images/polls_32.png' alt='' />");
 }
 if (!defined('E_32_PREFS')) {
-	define('E_32_PREFS', "<img src='".e_IMAGE."admin_images/prefs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_PREFS', "<img class='icon S32' src='".e_IMAGE."admin_images/prefs_32.png' alt='' />");
 }
 if (!defined('E_32_SEARCH')) {
-	define('E_32_SEARCH', "<img src='".e_IMAGE."admin_images/search_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_SEARCH', "<img class='icon S32' src='".e_IMAGE."admin_images/search_32.png' alt='' />");
 }
 if (!defined('E_32_UPLOADS')) {
-	define('E_32_UPLOADS', "<img src='".e_IMAGE."admin_images/uploads_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_UPLOADS', "<img class='icon S32' src='".e_IMAGE."admin_images/uploads_32.png' alt='' />");
 }
 if (!defined('E_32_EURL')) {
-	define('E_32_EURL', "<img src='".e_IMAGE."admin_images/eurl_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_EURL', "<img class='icon S32' src='".e_IMAGE."admin_images/eurl_32.png' alt='' />");
 }
 if (!defined('E_32_USER')) {
-	define('E_32_USER', "<img src='".e_IMAGE."admin_images/users_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_USER', "<img class='icon S32' src='".e_IMAGE."admin_images/users_32.png' alt='' />");
 }
 if (!defined('E_32_USER_EXTENDED')) {
-	define('E_32_USER_EXTENDED', "<img src='".e_IMAGE."admin_images/extended_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_USER_EXTENDED', "<img class='icon S32' src='".e_IMAGE."admin_images/extended_32.png' alt='' />");
 }
 if (!defined('E_32_USERCLASS')) {
-	define('E_32_USERCLASS', "<img src='".e_IMAGE."admin_images/userclass_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_USERCLASS', "<img class='icon S32' src='".e_IMAGE."admin_images/userclass_32.png' alt='' />");
 }
 if (!defined('E_32_LANGUAGE')) {
-	define('E_32_LANGUAGE', "<img src='".e_IMAGE."admin_images/language_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_LANGUAGE', "<img class='icon S32' src='".e_IMAGE."admin_images/language_32.png' alt='' />");
 }
 
 // Large Admin Other Link Images
 if (!defined('E_32_PLUGIN')) {
-	define('E_32_PLUGIN', "<img src='".e_IMAGE."admin_images/plugins_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_PLUGIN', "<img class='icon S32' src='".e_IMAGE."admin_images/plugins_32.png' alt='' />");
 }
 if (!defined('E_32_PLUGMANAGER')) {
-	define('E_32_PLUGMANAGER', "<img src='".e_IMAGE."admin_images/plugmanager_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_PLUGMANAGER', "<img class='icon S32' src='".e_IMAGE."admin_images/plugmanager_32.png' alt='' />");
 }
 if (!defined('E_32_DOCS')) {
-	define('E_32_DOCS', "<img src='".e_IMAGE."admin_images/docs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_DOCS', "<img class='icon S32' src='".e_IMAGE."admin_images/docs_32.png' alt='' />");
 }
 if (!defined('E_32_MAIN')) {
-	define('E_32_MAIN', "<img src='".e_IMAGE."admin_images/main_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_MAIN', "<img class='icon S32' src='".e_IMAGE."admin_images/main_32.png' alt='' />");
 }
 
 if (!defined('E_32_THEMEMANAGER')) {
-	define('E_32_THEMEMANAGER', "<img src='".e_IMAGE."admin_images/themes_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_THEMEMANAGER', "<img class='icon S32' src='".e_IMAGE."admin_images/themes_32.png' alt='' />");
 }
 
 // Large Admin Other Images
 if (!defined('E_32_COMMENT')) {
-	define('E_32_COMMENT', "<img src='".e_IMAGE."admin_images/comments_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_COMMENT', "<img class='icon S32' src='".e_IMAGE."admin_images/comments_32.png' alt='' />");
 }
 if (!defined('E_32_ADMINLOG')) {
-	define('E_32_ADMINLOG', "<img src='".e_IMAGE."admin_images/adminlogs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_ADMINLOG', "<img class='icon S32' src='".e_IMAGE."admin_images/adminlogs_32.png' alt='' />");
 }
 if (!defined('E_32_LOGOUT')) {
-	define('E_32_LOGOUT', "<img src='".e_IMAGE."admin_images/logout_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_LOGOUT', "<img class='icon S32' src='".e_IMAGE."admin_images/logout_32.png' alt='' />");
+}
+if (!defined('E_32_MANAGE')) {
+	define('E_32_MANAGE', "<img class='icon S32' src='".e_IMAGE."admin_images/manage_32.png' alt='' />");
+}
+if (!defined('E_32_CREATE')) {
+	define('E_32_CREATE', "<img class='icon S32' src='".e_IMAGE."admin_images/add_32.png' alt='' />");
+}
+if (!defined('E_32_SETTINGS')) {
+	define('E_32_SETTINGS', "<img class='icon S32' src='".e_IMAGE."admin_images/settings_32.png' alt='' />");
 }
 
 $e_icon_array = array(
@@ -407,30 +442,43 @@ $e_icon_array = array(
 	'users' => E_32_USER,
 	'wmessage' => E_32_WELCOME );
 
+//FIXME array structure - see shortcodes/admin_navigation.php
 $admin_cat['title'][1] = ADLAN_CL_1;
 $admin_cat['id'][1] = 'setMenu';
 $admin_cat['img'][1] = E_16_CAT_SETT;
 $admin_cat['lrg_img'][1] = E_32_CAT_SETT;
+$admin_cat['sort'][1] = true;
 
 $admin_cat['title'][2] = ADLAN_CL_2;
 $admin_cat['id'][2] = 'userMenu';
 $admin_cat['img'][2] = E_16_CAT_USER;
 $admin_cat['lrg_img'][2] = E_32_CAT_USER;
+$admin_cat['sort'][2] = true;
 
 $admin_cat['title'][3] = ADLAN_CL_3;
 $admin_cat['id'][3] = 'contMenu';
 $admin_cat['img'][3] = E_16_CAT_CONT;
 $admin_cat['lrg_img'][3] = E_32_CAT_CONT;
+$admin_cat['sort'][3] = true;
 
 $admin_cat['title'][4] = ADLAN_CL_6;
 $admin_cat['id'][4] = 'toolMenu';
 $admin_cat['img'][4] = E_16_CAT_TOOL;
 $admin_cat['lrg_img'][4] = E_32_CAT_TOOL;
+$admin_cat['sort'][4] = true;
 
 $admin_cat['title'][5] = ADLAN_CL_7;
 $admin_cat['id'][5] = 'plugMenu';
 $admin_cat['img'][5] = E_16_CAT_PLUG;
 $admin_cat['lrg_img'][5] = E_32_CAT_PLUG;
+$admin_cat['sort'][5] = false;
+
+//About menu
+$admin_cat['title'][6] = ADLAN_CL_8;
+$admin_cat['id'][6] = 'aboutMenu';
+$admin_cat['img'][6] = E_16_CAT_ABOUT;//E_16_NAV_DOCS
+$admin_cat['lrg_img'][6] = E_32_CAT_ABOUT;
+$admin_cat['sort'][6] = false;
 
 // Info about attributes
 /*
@@ -444,43 +492,69 @@ attribute 5 = category
 	3 - content
 	4 - tools
 	5 - plugins
+	6 - about
 attribute 6 = 16 x 16 image
 attribute 7 = 32 x 32 image
 */
 
+//FIXME array structure suitable for e_admin_menu - see shortcodes/admin_navigation.php
+//TODO find out where is used $array_functions elsewhere, refactor it
 $array_functions = array(
-	0 => array(e_ADMIN."administrator.php", ADLAN_8, ADLAN_9, "3", 2, E_16_ADMIN, E_32_ADMIN),
-	1 => array(e_ADMIN."updateadmin.php", ADLAN_10, ADLAN_11, "", 2, E_16_ADPASS, E_32_ADPASS),
-	2 => array(e_ADMIN."banlist.php", ADLAN_34, ADLAN_35, "4", 2, E_16_BANLIST, E_32_BANLIST),
-	3 => array(e_ADMIN."banner.php", ADLAN_54, ADLAN_55, "D", 3, E_16_BANNER, E_32_BANNER),
-	4 => array(e_ADMIN."cache.php", ADLAN_74, ADLAN_75, "C", 1, E_16_CACHE, E_32_CACHE),
-	5 => array(e_ADMIN."cpage.php", ADLAN_42, ADLAN_43, "5", 3, E_16_CUST, E_32_CUST),
-	6 => array(e_ADMIN."db.php", ADLAN_44, ADLAN_45, "0", 4, E_16_DATAB, E_32_DATAB),
-	7 => array(e_ADMIN."download.php", ADLAN_24, ADLAN_25, "R", 3, E_16_DOWNL, E_32_DOWNL),
-	8 => array(e_ADMIN."emoticon.php", ADLAN_58, ADLAN_59, "F", 1, E_16_EMOTE, E_32_EMOTE),
-	9 => array(e_ADMIN."filemanager.php", ADLAN_30, ADLAN_31, "6", 4, E_16_FILE, E_32_FILE),
-	10 => array(e_ADMIN."frontpage.php", ADLAN_60, ADLAN_61, "G", 1, E_16_FRONT, E_32_FRONT),
-	11 => array(e_ADMIN."image.php", ADLAN_105, ADLAN_106, "A", 1, E_16_IMAGES, E_32_IMAGES),
-	12 => array(e_ADMIN."links.php", ADLAN_138, ADLAN_139, "I", 1, E_16_LINKS, E_32_LINKS),
-	13 => array(e_ADMIN."wmessage.php", ADLAN_28, ADLAN_29, "M", 3, E_16_WELCOME, E_32_WELCOME),
-	14 => array(e_ADMIN."ugflag.php", ADLAN_40, ADLAN_41, "9", 4, E_16_MAINTAIN, E_32_MAINTAIN),
-	15 => array(e_ADMIN."menus.php", ADLAN_6, ADLAN_7, "2", 3, E_16_MENUS, E_32_MENUS),
-	16 => array(e_ADMIN."meta.php", ADLAN_66, ADLAN_67, "T", 1, E_16_META, E_32_META),
-	17 => array(e_ADMIN."newspost.php", ADLAN_0, ADLAN_1, "H", 3, E_16_NEWS, E_32_NEWS),
-	18 => array(e_ADMIN."phpinfo.php", ADLAN_68, ADLAN_69, "0", 4, E_16_PHP, E_32_PHP),
-	19 => array(e_ADMIN."prefs.php", ADLAN_4, ADLAN_5, "1", 1, E_16_PREFS, E_32_PREFS),
-	20 => array(e_ADMIN."search.php", ADLAN_142, ADLAN_143, "X", 1, E_16_SEARCH, E_32_SEARCH),
-	21 => array(e_ADMIN."admin_log.php", ADLAN_155, ADLAN_156, "S", 4, E_16_ADMINLOG, E_32_ADMINLOG),
-	22 => array(e_ADMIN."theme.php", ADLAN_140, ADLAN_141, "1", 4, E_16_THEMEMANAGER, E_32_THEMEMANAGER),
-	23 => array(e_ADMIN."upload.php", ADLAN_72, ADLAN_73, "V", 3, E_16_UPLOADS, E_32_UPLOADS),
-	24 => array(e_ADMIN."users.php", ADLAN_36, ADLAN_37, "4", 2, E_16_USER, E_32_USER),
-	25 => array(e_ADMIN."userclass2.php", ADLAN_38, ADLAN_39, "4", 2, E_16_USERCLASS, E_32_USERCLASS),
-	26 => array(e_ADMIN."language.php", ADLAN_132, ADLAN_133, "0", 1, E_16_LANGUAGE, E_32_LANGUAGE),
-	27 => array(e_ADMIN."mailout.php", ADLAN_136, ADLAN_137, "W", 2, E_16_MAIL, E_32_MAIL),
-	28 => array(e_ADMIN."users_extended.php", ADLAN_78, ADLAN_79, "4", 2, E_16_USER_EXTENDED, E_32_USER_EXTENDED),
-	29 => array(e_ADMIN."fileinspector.php", ADLAN_147, ADLAN_148, "Y", 4, E_16_INSPECT, E_32_INSPECT),
-	30 => array(e_ADMIN."notify.php", ADLAN_149, ADLAN_150, "O", 4, E_16_NOTIFY, E_32_NOTIFY),
-	31 => array(e_ADMIN."cron.php", ADLAN_157, ADLAN_158, "U", 4, E_16_CRON, E_32_CRON),
-	32 => array(e_ADMIN."eurl.php", ADLAN_159, ADLAN_160, "L", 1, E_16_EURL, E_32_EURL)
-	);
+	0 => array(e_ADMIN.'administrator.php', ADLAN_8, ADLAN_9, '3', 2, E_16_ADMIN, E_32_ADMIN),
+	1 => array(e_ADMIN.'updateadmin.php', ADLAN_10, ADLAN_11, '', 2, E_16_ADPASS, E_32_ADPASS),
+	2 => array(e_ADMIN.'banlist.php', ADLAN_34, ADLAN_35, '4', 2, E_16_BANLIST, E_32_BANLIST),
+	3 => array(e_ADMIN.'banner.php', ADLAN_54, ADLAN_55, 'D', 3, E_16_BANNER, E_32_BANNER),
+	4 => array(e_ADMIN.'cache.php', ADLAN_74, ADLAN_75, 'C', 1, E_16_CACHE, E_32_CACHE),
+	5 => array(e_ADMIN.'cpage.php', ADLAN_42, ADLAN_43, '5', 3, E_16_CUST, E_32_CUST),
+	6 => array(e_ADMIN.'db.php', ADLAN_44, ADLAN_45, '0', 4, E_16_DATAB, E_32_DATAB),
+	7 => array(e_ADMIN.'download.php', ADLAN_24, ADLAN_25, 'R', 3, E_16_DOWNL, E_32_DOWNL),
+	8 => array(e_ADMIN.'emoticon.php', ADLAN_58, ADLAN_59, 'F', 1, E_16_EMOTE, E_32_EMOTE),
+	9 => array(e_ADMIN.'filemanager.php', ADLAN_30, ADLAN_31, '6', 4, E_16_FILE, E_32_FILE),
+	10 => array(e_ADMIN.'frontpage.php', ADLAN_60, ADLAN_61, 'G', 1, E_16_FRONT, E_32_FRONT),
+	11 => array(e_ADMIN.'image.php', ADLAN_105, ADLAN_106, 'A', 1, E_16_IMAGES, E_32_IMAGES),
+	12 => array(e_ADMIN.'links.php', ADLAN_138, ADLAN_139, 'I', 1, E_16_LINKS, E_32_LINKS),
+	13 => array(e_ADMIN.'wmessage.php', ADLAN_28, ADLAN_29, 'M', 3, E_16_WELCOME, E_32_WELCOME),
+	14 => array(e_ADMIN.'ugflag.php', ADLAN_40, ADLAN_41, '9', 4, E_16_MAINTAIN, E_32_MAINTAIN),
+	15 => array(e_ADMIN.'menus.php', ADLAN_6, ADLAN_7, '2', 3, E_16_MENUS, E_32_MENUS),
+	16 => array(e_ADMIN.'meta.php', ADLAN_66, ADLAN_67, 'T', 1, E_16_META, E_32_META),
+	17 => array(e_ADMIN.'newspost.php', ADLAN_0, ADLAN_1, 'H', 3, E_16_NEWS, E_32_NEWS),
+	18 => array(e_ADMIN.'phpinfo.php', ADLAN_68, ADLAN_69, '0', 4, E_16_PHP, E_32_PHP),
+	19 => array(e_ADMIN.'prefs.php', ADLAN_4, ADLAN_5, '1', 1, E_16_PREFS, E_32_PREFS),
+	20 => array(e_ADMIN.'search.php', ADLAN_142, ADLAN_143, 'X', 1, E_16_SEARCH, E_32_SEARCH),
+	21 => array(e_ADMIN.'admin_log.php', ADLAN_155, ADLAN_156, 'S', 4, E_16_ADMINLOG, E_32_ADMINLOG),
+	22 => array(e_ADMIN.'theme.php', ADLAN_140, ADLAN_141, '1', 4, E_16_THEMEMANAGER, E_32_THEMEMANAGER),
+	23 => array(e_ADMIN.'upload.php', ADLAN_72, ADLAN_73, 'V', 3, E_16_UPLOADS, E_32_UPLOADS),
+	24 => array(e_ADMIN.'users.php', ADLAN_36, ADLAN_37, '4', 2, E_16_USER, E_32_USER),
+	25 => array(e_ADMIN.'userclass2.php', ADLAN_38, ADLAN_39, '4', 2, E_16_USERCLASS, E_32_USERCLASS),
+	26 => array(e_ADMIN.'language.php', ADLAN_132, ADLAN_133, '0', 1, E_16_LANGUAGE, E_32_LANGUAGE),
+	27 => array(e_ADMIN.'mailout.php', ADLAN_136, ADLAN_137, 'W', 2, E_16_MAIL, E_32_MAIL),
+	28 => array(e_ADMIN.'users_extended.php', ADLAN_78, ADLAN_79, '4', 2, E_16_USER_EXTENDED, E_32_USER_EXTENDED),
+	29 => array(e_ADMIN.'fileinspector.php', ADLAN_147, ADLAN_148, 'Y', 4, E_16_INSPECT, E_32_INSPECT),
+	30 => array(e_ADMIN.'notify.php', ADLAN_149, ADLAN_150, 'O', 4, E_16_NOTIFY, E_32_NOTIFY),
+	31 => array(e_ADMIN.'cron.php', ADLAN_157, ADLAN_158, 'U', 4, E_16_CRON, E_32_CRON),
+	32 => array(e_ADMIN.'eurl.php', ADLAN_159, ADLAN_160, 'L', 1, E_16_EURL, E_32_EURL),
+	33 => array(e_ADMIN.'plugin.php', ADLAN_98, ADLAN_99, 'Z', 5, E_16_PLUGMANAGER, E_32_PLUGMANAGER),
+	34 => array(e_ADMIN.'docs.php', ADLAN_12, ADLAN_13, '', 6, E_16_DOCS, E_32_DOCS),
+	35 => array('#TODO', 'System Info', 'System Information', '', 6, '', ''),
+	36 => array(e_ADMIN.'credits.php', LAN_CREDITS, LAN_CREDITS, '', 6, '', '')
+);
+
+//FIXME  array structure suitable for e_admin_menu - see shortcodes/admin_navigation.php
+/*
+ * Info about sublinks array structure
+ *
+ * key = $array_functions key
+ * attribute 1 = link
+ * attribute 2 = title
+ * attribute 3 = description
+ * attribute 4 = perms
+ * attribute 5 = category
+ * attribute 6 = 16 x 16 image
+ * attribute 7 = 32 x 32 image
+ *
+ */
+$array_sub_functions = array();
+$array_sub_functions[17][] = array(e_ADMIN.'newspost.php', LAN_MANAGE, ADLAN_3, 'H', 3, E_16_MANAGE, E_32_MANAGE);
+$array_sub_functions[17][] = array(e_ADMIN.'newspost.php?create', LAN_CREATE, ADLAN_2, 'H', 3, E_16_CREATE, E_32_CREATE);
+$array_sub_functions[17][] = array(e_ADMIN.'newspost.php?pref', LAN_PREFS, ADLAN_4, 'H', 3, E_16_SETTINGS, E_32_SETTINGS);
 ?>
diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php
index 3bba234de..9dffd372c 100644
--- a/e107_admin/banlist.php
+++ b/e107_admin/banlist.php
@@ -9,8 +9,8 @@
  * Ban List Management
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/banlist.php,v $
- * $Revision: 1.13 $
- * $Date: 2008-12-23 15:18:31 $
+ * $Revision: 1.14 $
+ * $Date: 2009-01-09 17:25:50 $
  * $Author: secretr $
  *
 */
@@ -725,7 +725,7 @@ switch($action)
 							$val = ($banlist_datestamp ? strftime(BAN_TIME_FORMAT, $banlist_datestamp) : BANLAN_22);
 							break;
 						case 'banlist_bantype':
-							$val = "<div class='nowrap' title='".constant('BANLAN_11'.$banlist_bantype)."'>".constant('BANLAN_10'.$banlist_bantype)." <a href='#' title='".constant('BANLAN_11'.$banlist_bantype)."' onclick='return false;'><img class='action info S16' src='".e_IMAGE_ABS."admin_images/docs_16.png' alt='' /></a></div>";
+							$val = "<div class='nowrap' title='".constant('BANLAN_11'.$banlist_bantype)."'>".constant('BANLAN_10'.$banlist_bantype)." <a href='#' title='".constant('BANLAN_11'.$banlist_bantype)."' onclick='return false;'><img class='action info S16' src='".e_IMAGE_ABS."admin_images/info_16.png' alt='' /></a></div>";
 							break;
 						case 'ip_reason':
 							$val = $e107->ipDecode($banlist_ip)."<br />".$fv.": ".$banlist_reason;
diff --git a/e107_admin/banner.php b/e107_admin/banner.php
index 5f6004e0f..c5d93a524 100644
--- a/e107_admin/banner.php
+++ b/e107_admin/banner.php
@@ -9,8 +9,8 @@
  * Banner Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/banner.php,v $
- * $Revision: 1.9 $
- * $Date: 2008-12-23 15:18:31 $
+ * $Revision: 1.10 $
+ * $Date: 2009-01-09 17:25:50 $
  * $Author: secretr $
  *
 */
@@ -243,7 +243,7 @@ if (!$action) {
 						<tr>
 							<td class='center'>".$banner_row['banner_id']."</td>
 							<td class='e-pointer' onclick=\"e107Helper.toggle('banner-infocell-{$banner_row['banner_id']}')\">
-								<a href='#banner-infocell-{$banner_row['banner_id']}' class='action e-expandit f-right' title='".BNRLAN_65."'><img class='action info S16' src='".e_IMAGE_ABS."admin_images/docs_16.png' alt='' /></a>
+								<a href='#banner-infocell-{$banner_row['banner_id']}' class='action e-expandit f-right' title='".BNRLAN_65."'><img class='action info S16' src='".e_IMAGE_ABS."admin_images/info_16.png' alt='' /></a>
 								".($banner_row['banner_clientname'] ? $banner_row['banner_clientname'] : BNRLAN_66)."
 								<div class='e-hideme clear' id='banner-infocell-{$banner_row['banner_id']}'>
 									<div class='indent'>
diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php
index 9bf807e0b..2d2a810d3 100644
--- a/e107_admin/eurl.php
+++ b/e107_admin/eurl.php
@@ -9,8 +9,8 @@
  * URL Management
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/eurl.php,v $
- * $Revision: 1.7 $
- * $Date: 2008-12-22 16:50:07 $
+ * $Revision: 1.8 $
+ * $Date: 2009-01-09 17:25:50 $
  * $Author: secretr $
 */
 
@@ -187,7 +187,7 @@ class admin_url_config {
 			$checked = $pref['url_config'][$section['path']] == $udefined_id ? ' checked="checked"' : '';
 			$custom = "
 				<input type='radio' class='radio' id='{$section['path']}-custom' name='cprofile[{$section['path']}]' value='{$udefined_id}'{$checked} /><label for='{$section['path']}-custom'>".LAN_EURL_UDEFINED."</label>
-				<a href='#{$section['path']}-custom-info' class='e-expandit' title='".LAN_EURL_INFOALT."'><img src='".e_IMAGE_ABS."admin_images/docs_16.png' alt='' /></a>
+				<a href='#{$section['path']}-custom-info' class='e-expandit' title='".LAN_EURL_INFOALT."'><img src='".e_IMAGE_ABS."admin_images/info_16.png' alt='' /></a>
 				<div class='e-hideme' id='{$section['path']}-custom-info'>
 				<div class='indent'>
 					".LAN_EURL_UDEFINED_INFO."<br />
@@ -215,7 +215,7 @@ class admin_url_config {
 				if($custom) $checked_profile = ' disabled="disabled"';
 				$config_profiles .= "
 					<input type='radio' class='radio' id='{$section['path']}-profile-{$config_profile}' name='cprofile[{$section['path']}]' value='{$profile_id}'{$checked_profile} /><label for='{$section['path']}-profile-{$config_profile}'>".LAN_EURL_PROFILE." [".varsettrue($profile_info['title'], $config_profile)."]</label>
-					<a href='#{$section['path']}-profile-{$config_profile}-info' class='e-expandit' title='".LAN_EURL_INFOALT."'><img class='icon action' src='".e_IMAGE_ABS."admin_images/docs_16.png' alt='' /></a>
+					<a href='#{$section['path']}-profile-{$config_profile}-info' class='e-expandit' title='".LAN_EURL_INFOALT."'><img class='icon action' src='".e_IMAGE_ABS."admin_images/info_16.png' alt='' /></a>
 					<div class='e-hideme' id='{$section['path']}-profile-{$config_profile}-info'>
 						<div class='indent'>
 							".(varsettrue($profile_info['title']) ? '<strong>'.$profile_info['title'].'</strong><br /><br />' : '')."
diff --git a/e107_admin/header.php b/e107_admin/header.php
index 9405033a3..8d90f265b 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -12,8 +12,8 @@
 |        GNU General Public License (http://gnu.org).
 |
 |   $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
-|   $Revision: 1.27 $
-|   $Date: 2008-12-29 15:23:06 $
+|   $Revision: 1.28 $
+|   $Date: 2009-01-09 17:25:50 $
 |   $Author: secretr $
 +---------------------------------------------------------------+
 */
@@ -344,10 +344,13 @@ $e107_var = array();
  * $e107_vars structure:
  * $e107_vars['action']['text'] -> link title
  * $e107_vars['action']['link'] -> if empty '#action' will be added as href attribute
+ * $e107_vars['action']['image'] -> (new) image tag
  * $e107_vars['action']['perm'] -> permissions
  * $e107_vars['action']['include'] -> additional <a> tag attributes
  * $e107_vars['action']['sub'] -> (new) array, exactly the same as $e107_vars' first level e.g. $e107_vars['action']['sub']['action2']['link']...
  * $e107_vars['action']['sort'] -> (new) used only if found in 'sub' array - passed as last parameter (recursive call)
+ * $e107_vars['action']['link_class'] -> (new) additional link class
+ * $e107_vars['action']['sub_class'] -> (new) additional class used only when sublinks are being parsed
  *
  * @param string $title
  * @param string $active_page
@@ -357,7 +360,7 @@ $e107_var = array();
  * @param bool $sortlist
  * @return string parsed admin menu (or empty string if title is empty)
  */
-function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_link = array(), $sortlist = false)
+function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_link = false, $sortlist = false)
 {
 	global $E_ADMIN_MENU, $e107;
 	if(!$tmpl) $tmpl = $E_ADMIN_MENU;
@@ -419,6 +422,7 @@ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_li
 	$search[6] = '/\{SUB_ID\}(.*?)/si';
 	$search[7] = '/\{LINK_CLASS\}(.*?)/si';
 	$search[8] = '/\{SUB_CLASS\}(.*?)/si';
+	$search[9] = '/\{LINK_IMAGE\}(.*?)/si';
 	foreach (array_keys($e107_vars) as $act)
 	{
 		$replace = array();
@@ -445,14 +449,15 @@ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_li
 		$rid = str_replace(array(' ', '_'), '-', $act).($id ? "-{$id}" : '');
 		$replace[5] = $id ? " id='eplug-nav-{$rid}'" : '';
 		$replace[6] = '';
-		$replace[7] = '';
+		$replace[7] = varset($e107_vars[$act]['link_class']);
 		$replace[8] = '';
+		$replace[9] = $e107_vars[$act]['image'];
 
 		if(varsettrue($e107_vars[$act]['sub']))
 		{
 			$replace[6] = $id ? " id='eplug-nav-{$rid}-sub'" : '';
-			$replace[7] = ' e-expandit';
-			$replace[8] = ' e-hideme e-expandme';
+			$replace[7] = ' '.varset($e107_vars[$act]['link_class'], 'e-expandit');
+			$replace[8] = ' '.varset($e107_vars[$act]['sub_class'], 'e-hideme e-expandme');
 			$replace[4] = preg_replace($search, $replace, $tmpl['start_sub']);
 			$replace[4] .= e_admin_menu(false, $active_page, $e107_vars[$act]['sub'], $tmpl, true, (isset($e107_vars[$act]['sort']) ? $e107_vars[$act]['sort'] : $sortlist));
 			$replace[4] .= $tmpl['end_sub'];
diff --git a/e107_admin/image.php b/e107_admin/image.php
index 2f5ba9945..632c515dc 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -9,8 +9,8 @@
  * Image Administration Area
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
- * $Revision: 1.19 $
- * $Date: 2008-12-29 15:23:06 $
+ * $Revision: 1.20 $
+ * $Date: 2009-01-09 17:25:50 $
  * $Author: secretr $
  *
 */
@@ -260,7 +260,7 @@ if (isset($_POST['show_avatars']))
 			if(is_dir(e_FILE."public/avatars/".$image_name))
 			{
 				//File info
-				$users = "<a class='e-tooltip' href='#' title='".IMALAN_69.": {$image_name}'><img class='icon S16' src='".e_IMAGE_ABS."admin_images/docs_16.png' alt='".IMALAN_66.": {$image_name}' /></a> <span class='error'>".IMALAN_69."</span>";
+				$users = "<a class='e-tooltip' href='#' title='".IMALAN_69.": {$image_name}'><img class='icon S16' src='".e_IMAGE_ABS."admin_images/info_16.png' alt='".IMALAN_66.": {$image_name}' /></a> <span class='error'>".IMALAN_69."</span>";
 
 				//Friendly UI - click text to select a form element
 				$img_src =  '<span class="error">'.IMALAN_70.'</span>';
@@ -269,7 +269,7 @@ if (isset($_POST['show_avatars']))
 			else
 			{
 				//File info
-				$users = "<a class='e-tooltip' href='#' title='".IMALAN_66.": {$image_name}'><img src='".e_IMAGE_ABS."admin_images/docs_16.png' alt='".IMALAN_66.": {$image_name}' /></a> ".$users;
+				$users = "<a class='e-tooltip' href='#' title='".IMALAN_66.": {$image_name}'><img src='".e_IMAGE_ABS."admin_images/info_16.png' alt='".IMALAN_66.": {$image_name}' /></a> ".$users;
 
 				// Control over the image size (design)
 				$image_size = getimagesize(e_FILE."public/avatars/".$image_name);
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 959f6d417..3f6322a07 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -9,9 +9,9 @@
  * Administration - Site Preferences
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/prefs.php,v $
- * $Revision: 1.24 $
- * $Date: 2009-01-04 16:00:19 $
- * $Author: e107steved $
+ * $Revision: 1.25 $
+ * $Date: 2009-01-09 17:25:50 $
+ * $Author: secretr $
  *
 */
 require_once ("../class2.php");
@@ -365,6 +365,13 @@ $text .= "
 							<div class='smalltext field-help'>".PRFLAN_98."</div>
 						</td>
 					</tr>
+					<tr>
+						<td class='label'>".PRFLAN_199."</td>
+						<td class='control'>
+							".$frm->radio_switch('admin_slidedown_subs', $pref['admin_slidedown_subs'])."
+							<div class='smalltext field-help'>".PRFLAN_200."</div>
+						</td>
+					</tr>
 				</tbody>
 			</table>
 			".pref_submit('admindisp')."
diff --git a/e107_files/def_e107_prefs.php b/e107_files/def_e107_prefs.php
index ea58bc2aa..be079014d 100644
--- a/e107_files/def_e107_prefs.php
+++ b/e107_files/def_e107_prefs.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/def_e107_prefs.php,v $
-|     $Revision: 1.20 $
-|     $Date: 2009-01-04 16:00:19 $
-|     $Author: e107steved $
+|     $Revision: 1.21 $
+|     $Date: 2009-01-09 17:25:50 $
+|     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 
@@ -71,7 +71,7 @@ City, State, Country
   'displayname_class' => 255,
   'displayname_maxlength' => 15,
   'loginname_maxlength' => 30,
-  
+
   'profanity_filter' => '0',
   'profanity_replace' => '[censored]',
   'smiley_activate' => '',
@@ -138,6 +138,7 @@ City, State, Country
   'post_html' => '254',
   'redirectsiteurl' => '0',
   'admin_alerts_uniquemenu' => '0',
+  'admin_slidedown_subs' => '1',
   'null' => '',
   'links_new_window' => '1',
   'main_wordwrap' => '',
diff --git a/e107_files/shortcode/admin_navigation.php b/e107_files/shortcode/admin_navigation.php
new file mode 100644
index 000000000..158971e34
--- /dev/null
+++ b/e107_files/shortcode/admin_navigation.php
@@ -0,0 +1,132 @@
+<?php
+ /*
+ * e107 website system (c) 2001-2008 Steve Dunstan (e107.org)
+ * $Id: admin_navigation.php,v 1.1 2009-01-09 17:25:50 secretr Exp $
+ */
+
+
+function admin_navigation_shortcode($parm)
+{
+	if (!ADMIN) return '';
+
+	global $admin_cat, $array_functions, $array_sub_functions, $pref;
+
+	$e107 = &e107::getInstance();
+	$sql = &$e107->sql;
+
+	parse_str($parm, $parms);
+	$tmpl = strtoupper(varset($parms['tmpl'], 'E_ADMIN_NAVIGATION'));
+	global $$tmpl;
+
+	require(e_ADMIN.'ad_links.php');
+	require_once(e_HANDLER.'admin_handler.php');
+
+
+
+
+	// MAIN LINK
+	$menu_vars = array();
+	$menu_vars['main']['text'] = ADLAN_151;
+	$menu_vars['main']['link'] = e_ADMIN_ABS.'admin.php';
+	$menu_vars['main']['image'] = "<img src='".E_16_NAV_MAIN."' alt='".ADLAN_151."' class='icon S16' />";
+	$menu_vars['main']['image_src'] = ADLAN_151;
+	$menu_vars['main']['perm'] = '';
+
+	//ALL OTHER ROOT LINKS - temporary data transformation - data structure will be changed in the future and this block will be removed
+	$cnt = count($admin_cat['id']);
+	for ($i = 1; $i <= $cnt; $i++)
+	{
+		$id = $admin_cat['id'][$i];
+		$menu_vars[$id]['text'] = $admin_cat['title'][$i];
+		$menu_vars[$id]['description'] = $admin_cat['title'][$i];
+		$menu_vars[$id]['link'] = '#';
+		$menu_vars[$id]['image'] = "<img src='".$admin_cat['img'][$i]."' alt='".$admin_cat['title'][$i]."' class='icon S16' />";
+		$menu_vars[$id]['image_large'] = "<img src='".$admin_cat['lrg_img'][$i]."' alt='".$admin_cat['title'][$i]."' class='icon S32' />";
+		$menu_vars[$id]['image_src'] = $admin_cat['img'][$i];
+		$menu_vars[$id]['image_large_src'] = $admin_cat['lrg_img'][$i];
+		$menu_vars[$id]['perm'] = '';
+		$menu_vars[$id]['sort'] = $admin_cat['sort'][$i];
+	}
+
+	//CORE SUBLINKS
+	foreach ($array_functions as $key => $subitem)
+	{
+			$catid = $admin_cat['id'][$subitem[4]];
+			$tmp = array();
+
+			$tmp['text'] = $subitem[1];
+			$tmp['description'] = $subitem[2];
+			$tmp['link'] = $subitem[0];
+			$tmp['image'] = $subitem[5];
+			$tmp['image_large'] = $subitem[6];
+			$tmp['image_src'] = '';
+			$tmp['image_large_src'] = '';
+			$tmp['perm'] = $subitem[3];
+			$tmp['sub_class'] = '';
+			$tmp['sort'] = false;
+
+			if($pref['admin_slidedown_subs'] && varsettrue($array_sub_functions[$key]))
+			{
+				$tmp['sub_class'] = 'sub';
+				foreach ($array_sub_functions[$key] as $subkey => $subsubitem)
+				{
+					$subid = $key.'_'.$subkey;
+					$tmp['sub'][$subid]['text'] = $subsubitem[1];
+					$tmp['sub'][$subid]['description'] = $subsubitem[2];
+					$tmp['sub'][$subid]['link'] = $subsubitem[0];
+					$tmp['sub'][$subid]['image'] = $subsubitem[5];
+					$tmp['sub'][$subid]['image_large'] = $subsubitem[6];
+					$tmp['sub'][$subid]['image_src'] = '';
+					$tmp['sub'][$subid]['image_large_src'] = '';
+					$tmp['sub'][$subid]['perm'] = $subsubitem[3];
+				}
+			}
+
+			if($tmp) $menu_vars[$catid]['sub'][$key] = $tmp;
+	}
+
+	//PLUGINS
+	require_once(e_HANDLER.'plugin_class.php');
+	$plug = new e107plugin;
+	$tmp = array();
+
+	if($sql->db_Select("plugin", "*", "plugin_installflag=1 ORDER BY plugin_path"))
+	{
+		while($row = $sql->db_Fetch())
+		{
+			//if(getperms('P'.$row['plugin_id']))
+			//{
+				if($plug->parse_plugin($row['plugin_path']))
+				{
+					$plug_vars = $plug->plug_vars;
+					loadLanFiles($row['plugin_path'], 'admin');
+					if($plug_vars['administration']['configFile'])
+					{
+						$plugpath = isset($plug_vars['plugin_php']) ? e_PLUGIN_ABS : e_PLUGIN_ABS.$row['plugin_path'].'/';
+						$icon_src = isset($plug_vars['administration']['iconSmall']) ? $plugpath.'/'.$plug_vars['administration']['iconSmall'] : '';
+						$icon_src_lrg = isset($plug_vars['administration']['icon']) ? $plugpath.'/'.$plug_vars['administration']['iconSmall'] : '';
+						$id = 'plugnav-'.$row['plugin_path'];
+
+
+						$tmp[$id]['text'] = $e107->tp->toHTML($plug_vars['@attributes']['name'], FALSE, "defs");
+						$tmp[$id]['description'] = $plug_vars['description'];
+						$tmp[$id]['link'] = e_PLUGIN_ABS.$row['plugin_path'].'/'.$plug_vars['administration']['configFile'];
+						$tmp[$id]['image'] = $icon_src ? "<img src='{$icon_src}' alt='{$tmp['text']}' class='icon S16' />" : E_16_PLUGIN;
+						$tmp[$id]['image_large'] = $icon_src_lrg ? "<img src='{$icon_src_lrg}' alt='{$tmp['text']}' class='icon S32' />" : $icon_src_lrg;
+						$tmp[$id]['image_src'] = $icon_src;
+						$tmp[$id]['image_large_src'] = $icon_src_lrg;
+						$tmp[$id]['perm'] = 'P'.$row['plugin_id'];
+						$tmp[$id]['sub_class'] = '';
+
+						//TODO plugins sublinks support
+					}
+				}
+			//}
+		}
+		$menu_vars['plugMenu']['sub'] += multiarray_sort($tmp, 'text');
+
+	}
+
+	return e_admin_menu('', '', $menu_vars, $$tmpl, false, false);
+
+}
\ No newline at end of file
diff --git a/e107_handlers/admin_handler.php b/e107_handlers/admin_handler.php
index 058b6c041..cedfac630 100644
--- a/e107_handlers/admin_handler.php
+++ b/e107_handlers/admin_handler.php
@@ -19,7 +19,7 @@ if (!function_exists('asortbyindex')) {
 		return ($sortarray);
 	}
 }
-	
+
 if (!function_exists('comesafter')) {
 	function comesafter($s1, $s2) {
 		$order = 1;
@@ -36,4 +36,31 @@ if (!function_exists('comesafter')) {
 		return ($order);
 	}
 }
+
+if (!function_exists('multiarray_sort')) {
+    function multiarray_sort(&$array, $key, $order = 'asc', $natsort = true, $case = true)
+    {
+        if(!is_array($array)) return $array;
+
+        $order = strtolower($order);
+        foreach ($array as $i => $arr)
+        {
+           $sort_values[$i] = $arr[$key];
+        }
+
+        if(!$natsort) ($order=='asc')? asort($sort_values) : arsort($sort_values);
+        else
+        {
+             $case ? natsort($sort_values) : natcasesort($sort_values);
+             if($order != 'asc') $sort_values = array_reverse($sort_values, true);
+        }
+        reset ($sort_values);
+
+        while (list ($arr_key, $arr_val) = each ($sort_values))
+        {
+             $sorted_arr[] = $array[$arr_key];
+        }
+        return $sorted_arr;
+    }
+}
 ?>
\ No newline at end of file
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index a6363d21c..2edc6e7ba 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
-|     $Revision: 1.26 $
-|     $Date: 2009-01-04 20:55:37 $
-|     $Author: e107steved $
+|     $Revision: 1.27 $
+|     $Date: 2009-01-09 17:25:50 $
+|     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 
@@ -34,6 +34,9 @@ class e107
 	var $relative_base_path;
 	var $_ip_cache;
 	var $_host_name_cache;
+	var $sql;
+	var $tp;
+	var $url;
 
 	/**
 	 * e107 class constructor
@@ -42,9 +45,9 @@ class e107
 	 * @param string $e107_root_path
 	 * @return e107
 	 */
-	function e107()
+	function e107($php4_check)
 	{
-		if(defined('e107_php4_check') && constant('e107_php4_check'))
+		if($php4_check !== 'e107_class_php4_very_long_hard_to_remember_check')
 		{
 			echo ('Fatal error! You are not allowed to direct instantinate an object for singleton class! Please use e107::getInstance()');
 			exit();
@@ -58,22 +61,21 @@ class e107
 		$this->file_path = $this->fix_windows_paths($e107_root_path)."/";
 	}
 
-  /**
-   * Get instance - php4 singleton implementation
-   *
-   * @return singleton object
-   */
-  function &getInstance()
-  {
-    static $instance = array();//it's array because of an odd PHP 4 bug
+	/**
+	 * Get instance - php4 singleton implementation
+	 *
+	 * @return singleton object
+	 */
+	function &getInstance()
+	{
+		static $instance = array();//it's array because of an odd PHP 4 bug
 
-    if(!$instance)
-    {
-        $instance[0] = new e107();
-        define('e107_php4_check', true);
-    }
-    return $instance[0];
-  }
+		if(!$instance)
+		{
+		    $instance[0] = new e107('e107_class_php4_very_long_hard_to_remember_check');
+		}
+	  	return $instance[0];
+	}
 
 	function set_base_path()
 	{
diff --git a/e107_images/admin_images/add_16.png b/e107_images/admin_images/add_16.png
new file mode 100644
index 000000000..e9485082e
Binary files /dev/null and b/e107_images/admin_images/add_16.png differ
diff --git a/e107_images/admin_images/add_32.png b/e107_images/admin_images/add_32.png
new file mode 100644
index 000000000..90fec1df1
Binary files /dev/null and b/e107_images/admin_images/add_32.png differ
diff --git a/e107_images/admin_images/copy_16.png b/e107_images/admin_images/copy_16.png
new file mode 100644
index 000000000..b7c938a99
Binary files /dev/null and b/e107_images/admin_images/copy_16.png differ
diff --git a/e107_images/admin_images/copy_32.png b/e107_images/admin_images/copy_32.png
new file mode 100644
index 000000000..18627b748
Binary files /dev/null and b/e107_images/admin_images/copy_32.png differ
diff --git a/e107_images/admin_images/docs_16.png b/e107_images/admin_images/docs_16.png
index 63b21b0d5..24c9c5757 100644
Binary files a/e107_images/admin_images/docs_16.png and b/e107_images/admin_images/docs_16.png differ
diff --git a/e107_images/admin_images/docs_32.png b/e107_images/admin_images/docs_32.png
index d8197d61a..ac2ff05c7 100644
Binary files a/e107_images/admin_images/docs_32.png and b/e107_images/admin_images/docs_32.png differ
diff --git a/e107_images/admin_images/info_16.png b/e107_images/admin_images/info_16.png
new file mode 100644
index 000000000..63b21b0d5
Binary files /dev/null and b/e107_images/admin_images/info_16.png differ
diff --git a/e107_images/admin_images/info_32.png b/e107_images/admin_images/info_32.png
new file mode 100644
index 000000000..d8197d61a
Binary files /dev/null and b/e107_images/admin_images/info_32.png differ
diff --git a/e107_images/admin_images/manage_16.png b/e107_images/admin_images/manage_16.png
new file mode 100644
index 000000000..f5b6aff14
Binary files /dev/null and b/e107_images/admin_images/manage_16.png differ
diff --git a/e107_images/admin_images/manage_32.png b/e107_images/admin_images/manage_32.png
new file mode 100644
index 000000000..9f1b92f41
Binary files /dev/null and b/e107_images/admin_images/manage_32.png differ
diff --git a/e107_images/admin_images/move_16.png b/e107_images/admin_images/move_16.png
new file mode 100644
index 000000000..970ae3e0e
Binary files /dev/null and b/e107_images/admin_images/move_16.png differ
diff --git a/e107_images/admin_images/move_32.png b/e107_images/admin_images/move_32.png
new file mode 100644
index 000000000..3ce5b0a1f
Binary files /dev/null and b/e107_images/admin_images/move_32.png differ
diff --git a/e107_images/admin_images/rename_16.png b/e107_images/admin_images/rename_16.png
new file mode 100644
index 000000000..2160a353a
Binary files /dev/null and b/e107_images/admin_images/rename_16.png differ
diff --git a/e107_images/admin_images/rename_32.png b/e107_images/admin_images/rename_32.png
new file mode 100644
index 000000000..e55b3e8a5
Binary files /dev/null and b/e107_images/admin_images/rename_32.png differ
diff --git a/e107_images/admin_images/settings_16.png b/e107_images/admin_images/settings_16.png
new file mode 100644
index 000000000..98d4b9969
Binary files /dev/null and b/e107_images/admin_images/settings_16.png differ
diff --git a/e107_images/admin_images/settings_32.png b/e107_images/admin_images/settings_32.png
new file mode 100644
index 000000000..135fd11b9
Binary files /dev/null and b/e107_images/admin_images/settings_32.png differ
diff --git a/e107_images/admin_images/up_16.png b/e107_images/admin_images/up_16.png
new file mode 100644
index 000000000..67b85b1a7
Binary files /dev/null and b/e107_images/admin_images/up_16.png differ
diff --git a/e107_images/admin_images/up_32.png b/e107_images/admin_images/up_32.png
new file mode 100644
index 000000000..c8d95456d
Binary files /dev/null and b/e107_images/admin_images/up_32.png differ
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 1e35858c2..b42417c81 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -1,14 +1,15 @@
 <?php
 /*
  * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_admin.php,v 1.15 2008-12-22 16:50:07 secretr Exp $
+ * $Id: lan_admin.php,v 1.16 2009-01-09 17:25:50 secretr Exp $
  *
  * Admin Language File
 */
 define("ADLAN_0", "News");
-define("ADLAN_1", "Add/edit/delete news items");
-//define("ADLAN_2", "News Categories");
-//define("ADLAN_3", "Add/edit/delete news categories");
+define("ADLAN_1", "Manage news items");
+define("ADLAN_2", "Create news item");
+define("ADLAN_3", "News items List");
+define("ADLAN_3a", "News Settings");
 define("ADLAN_4", "Preferences");
 define("ADLAN_5", "Edit Site Preferences");
 define("ADLAN_6", "Menus");
@@ -17,8 +18,8 @@ define("ADLAN_8", "Administrators");
 define("ADLAN_9", "Add/delete site administrators");
 define("ADLAN_10", "Admin password");
 define("ADLAN_11", "Change your password");
-//define("ADLAN_12", "Forums");
-//define("ADLAN_13", "Add/Edit Forums");
+define("ADLAN_12", "Docs");
+define("ADLAN_13", "System documentation");
 //define("ADLAN_14", "Articles");
 //define("ADLAN_15", "Add new/edit/delete articles");
 //define("ADLAN_16", "Content");
@@ -187,7 +188,7 @@ define('ADLAN_CL_4', 'Coms');
 define('ADLAN_CL_5', 'Files');
 define('ADLAN_CL_6', 'Tools');
 define('ADLAN_CL_7', 'Plugins');
-define('ADLAN_CL_8', 'Docs');
+define('ADLAN_CL_8', 'About');
 
 define("ADLAN_LAT_1", "Latest");
 
@@ -211,6 +212,7 @@ define("ADLAN_ERR_6", "Then, click here to re-scan your plugin folders.");
 define("LAN_EDIT","Edit");
 define("LAN_DELETE","Delete");
 define("LAN_CREATE","Create");
+define("LAN_MANAGE","Manage");
 define("LAN_UPDATE","Update");
 define("LAN_SAVE","Save");
 define("LAN_SAVED","Saved");
diff --git a/e107_languages/English/admin/lan_prefs.php b/e107_languages/English/admin/lan_prefs.php
index 9a1eacdb2..245d66073 100644
--- a/e107_languages/English/admin/lan_prefs.php
+++ b/e107_languages/English/admin/lan_prefs.php
@@ -12,9 +12,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_prefs.php,v $
-|     $Revision: 1.16 $
-|     $Date: 2009-01-04 16:00:19 $
-|     $Author: e107steved $
+|     $Revision: 1.17 $
+|     $Date: 2009-01-09 17:25:50 $
+|     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 
@@ -108,7 +108,7 @@ define("PRFLAN_94", "here");
 define("PRFLAN_95", "Display plugins info:");
 define("PRFLAN_96", "Will display info on all admin pages for each plugin supporting this type of feature");
 define("PRFLAN_97", "Unique 'Plugins info' menu:");
-define("PRFLAN_98", "If unchecked, each plugin will display its own info in an individual menu. If checked all info will be displayed in one menu.");
+define("PRFLAN_98", "If disabled, each plugin will display its own info in an individual menu. If enabled all info will be displayed in one menu.");
 define("PRFLAN_101", "Text rendering");
 define("PRFLAN_102", "Replace clickable URLs");
 define("PRFLAN_103", "If ticked, and 'Make Clickable' (above) is also ticked, posted URLs are displayed as a hyperlink using text from the textbox below. This keeps very long URLs from breaking layout.");
@@ -212,4 +212,7 @@ define('PRFLAN_198', 'If disabled, user has to explicitly log in after signup');
 //0.8
 define("PRFLAN_154a", "If 'Admin Approval' is selected, it is recommended that you enable email notification on user signup <a href='".e_ADMIN."notify.php'>here</a>.");
 define('PRFLAN_196a', 'Log directory:');
+
+define("PRFLAN_199", "Show Admin Sub-links");
+define("PRFLAN_200", "If enabled, Admin slide down navigation menu (if supported by the current theme) will render sub-links when needed (e.g. News - Create news item).");
 ?>
\ No newline at end of file
diff --git a/e107_themes/_blank/admin_template.php b/e107_themes/_blank/admin_template.php
index 59c7d5189..4292eacc7 100644
--- a/e107_themes/_blank/admin_template.php
+++ b/e107_themes/_blank/admin_template.php
@@ -9,8 +9,8 @@
  * Admin template - _blank theme
  *
  * $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $
- * $Revision: 1.9 $
- * $Date: 2008-12-19 14:01:07 $
+ * $Revision: 1.10 $
+ * $Date: 2009-01-09 17:25:50 $
  * $Author: secretr $
  *
 */
@@ -20,7 +20,7 @@ if (!defined('e107_INIT')) { exit; }
 define("ADLINK_COLS",5);
 include_lan(THEME."languages/".e_LANGUAGE.".php");
 
-
+//{FS_ADMIN_ALT_NAV}
 $ADMIN_HEADER = "
 <div class='admin-wrapper'>
 	<div class='admin-header'>
@@ -30,10 +30,11 @@ $ADMIN_HEADER = "
 			{ADMIN_LOGGED}
 			{ADMIN_SEL_LAN}
 			{ADMIN_USERLAN}
+
 		</div>
 		<div style='height: 20px;'><!-- --></div>
 		<div class='admin-navigation'>
-			{FS_ADMIN_ALT_NAV}
+			<div id='nav'>{ADMIN_NAVIGATION}</div>
 			<div class='clear'><!-- --></div>
 		</div>
 	</div>
@@ -93,10 +94,8 @@ $ADMIN_FOOTER = "
 ";
 
 /* NEW ADMIN MENU TEMPLATE
-
  * see function e_admin_menu() in e107_admin/header.php
-
-*/
+ */
 $E_ADMIN_MENU['start'] = '
 <ul class="plugin-navigation">
 ';
@@ -138,45 +137,50 @@ $E_ADMIN_MENU['end_sub'] = '
 $E_ADMIN_MENU['end'] = '
 </ul>
 ';
-/*
-$BUTTONS_START = '
-<ul class="plugin-navigation">
-';
-$BUTTON = '
-	<li>
-		<a class="link" href="{LINK_URL}"{ONCLICK}>&raquo;&nbsp;{LINK_TEXT}</a>
-		{SUB_LINK}
-	</li>
-';
-$BUTTON_OVER = '
-	<li>
-		<a class="link-active" href="{LINK_URL}"{ONCLICK}>&raquo;&nbsp;{LINK_TEXT}</a>
-	</li>
-';
-$SUB_BUTTONS_START = '
-<ul class="plugin-navigation">
-	<li>
-		<a class="link" href="{LINK_URL}" onclick="expandit(\'{SUB_HEAD_ID}\');" >&raquo;&nbsp;{SUB_HEAD}</a>
-		<ul class="plugin-navigation-sub" id="{SUB_HEAD_ID}" style="display: none">
-';
-$SUB_BUTTON = '
-			<li>
-				<a class="link" href="{LINK_URL}">&raquo;&nbsp;{LINK_TEXT}</a>
-			</li>
-';
-$SUB_BUTTON_OVER = '
-			<li>
-				<a class="link-active" href="{LINK_URL}">&raquo;&nbsp;{LINK_TEXT}</a>
-			</li>
-';
-$SUB_BUTTONS_END = '
-		</ul>
-	</li>
-</ul>
-';
-$BUTTONS_END = '
-</ul>
-';
-*/
 
+/* NEW ADMIN SLIDE DOWN MENU TEMPLATE
+ * see function admin_navigation() in e107_files/shortcodes/admin_navigation.php
+ * TODO move it together with menu.css/menu.js to the theme templates/e107_files folder (default menu render)
+ */
+$E_ADMIN_NAVIGATION['start'] = '
+<ul id="nav-links">
+';
+
+$E_ADMIN_NAVIGATION['button'] = '
+	<li>
+		<a class="menuButton" href="{LINK_URL}"{ONCLICK}>{LINK_IMAGE}{LINK_TEXT}</a>
+		{SUB_MENU}
+	</li>
+';
+$E_ADMIN_NAVIGATION['button_active'] = '
+	<li>
+		<a class="menuButton active" href="{LINK_URL}"{ONCLICK}>{LINK_IMAGE}{LINK_TEXT}</a>
+		{SUB_MENU}
+	</li>
+';
+
+$E_ADMIN_NAVIGATION['start_sub'] = '
+		<ul class="menu"{SUB_ID}>
+';
+
+$E_ADMIN_NAVIGATION['button_sub'] = '
+			<li>
+				<a class="menuItem{SUB_CLASS}" href="{LINK_URL}"{ONCLICK}>{LINK_IMAGE}{LINK_TEXT}</a>
+				{SUB_MENU}
+			</li>
+';
+$E_ADMIN_NAVIGATION['button_active_sub'] = '
+			<li>
+				<a class="menuItem{SUB_CLASS}" href="{LINK_URL}"{ONCLICK}>{LINK_IMAGE}{LINK_TEXT}</a>
+				{SUB_MENU}
+			</li>
+';
+
+$E_ADMIN_NAVIGATION['end_sub'] = '
+		</ul>
+';
+
+$E_ADMIN_NAVIGATION['end'] = '
+</ul>
+';
 ?>
\ No newline at end of file
diff --git a/e107_themes/_blank/fs_admin_alt_nav.sc b/e107_themes/_blank/fs_admin_alt_nav.sc
index 51dc8b9bb..299c9d6cb 100644
--- a/e107_themes/_blank/fs_admin_alt_nav.sc
+++ b/e107_themes/_blank/fs_admin_alt_nav.sc
@@ -1,10 +1,10 @@
 /*
 * e107 website system (c) 2001-2008 Steve Dunstan (e107.org)
-* $Id: fs_admin_alt_nav.sc,v 1.3 2008-12-10 22:39:43 e107steved Exp $
+* $Id: fs_admin_alt_nav.sc,v 1.4 2009-01-09 17:25:50 secretr Exp $
 */
 
-if (ADMIN) 
-{
+if (!ADMIN) return '';
+
 	global $sql, $pref, $tp;
 	parse_str($parm);
 	require(e_ADMIN.'ad_links.php');
@@ -42,7 +42,7 @@ if (ADMIN)
 	<tr><td>
 	<div class='menuBar' style='width: 100%'>";
 */
-	
+
 	$text .= '
 		<div id="nav">
 	';
@@ -50,8 +50,8 @@ if (ADMIN)
 		$text .= '<ul style="float: right"><li>'.adnav_cat_fs(ADLAN_53, e_BASE.'index.php', E_16_NAV_LEAV).'</li>';
 		$text .= '<li>'.adnav_cat_fs(ADLAN_46, e_ADMIN.'admin.php?logout', E_16_NAV_LGOT).'</li></ul>';
 	}
-	
-	$text .= '	
+
+	$text .= '
 			<ul class="level1" id="nav-links">
 	';
 
@@ -88,7 +88,7 @@ if (ADMIN)
 			}
 		}
 		$ad_texti .= '</ul>';
-		if ($ad_tmpi == 1) 
+		if ($ad_tmpi == 1)
 		{
 			$text .= $nav_main;
 			$text .= $ad_texti;
@@ -131,13 +131,13 @@ if (ADMIN)
 		}
 		ksort($plugin_array, SORT_STRING);
 		$plugs_text = '';
-		foreach ($plugin_array as $plugin_compile) 
+		foreach ($plugin_array as $plugin_compile)
 		{
 			$plugs_text .= $plugin_compile;
 		}
 	}
 
-	if (getperms('Z')) 
+	if (getperms('Z'))
 	{
 		$pclass_extended = $active_plugs ? 'header' : '';
 		$plugin_text = adnav_main_fs(ADLAN_98, e_ADMIN.'plugin.php', E_16_PLUGMANAGER, FALSE, $pclass_extended);
@@ -145,12 +145,12 @@ if (ADMIN)
 	}
 
 	if ($render_plugins) {
-		
+
 		if (defined('FS_ADMIN_LINK_SEPARATOR')) {
 			$text .= "
 			<li class='fs-linkSep'>".FS_ADMIN_LINK_SEPARATOR."</li>";
 		}
-		
+
 		$text .= '<li>';
 		$text .= adnav_cat_fs(ADLAN_CL_7, '', E_16_CAT_PLUG, 'plugMenu');
 		$text .= "<ul id='plugMenu' class='menu'>";
@@ -167,14 +167,14 @@ if (ADMIN)
 	$text .= '<li>';
 	$text .= adnav_cat_fs(ADLAN_CL_8, '', E_16_NAV_DOCS, 'docsMenu');
 	$text .= "<ul id='docsMenu' class='menu'>";
-	if (!$handle=opendir(e_DOCS.e_LANGUAGE."/")) 
+	if (!$handle=opendir(e_DOCS.e_LANGUAGE."/"))
 	{
 		$handle=opendir(e_DOCS."English/");
 	}
 	$i=1;
-	while ($file = readdir($handle)) 
+	while ($file = readdir($handle))
 	{
-		if ($file != "." && $file != ".." && $file != "CVS") 
+		if ($file != "." && $file != ".." && $file != "CVS")
 		{
 			$text .= '<li>'.adnav_main_fs(str_replace("_", " ", $file), e_ADMIN."docs.php?".$i, E_16_DOCS).'</li>';
 			$i++;
@@ -191,4 +191,3 @@ if (ADMIN)
 	';
 
 	return $text;
-}
\ No newline at end of file
diff --git a/e107_themes/_blank/images/links_sub.gif b/e107_themes/_blank/images/links_sub.gif
new file mode 100644
index 000000000..5dff444a2
Binary files /dev/null and b/e107_themes/_blank/images/links_sub.gif differ
diff --git a/e107_themes/_blank/menu/menu.css b/e107_themes/_blank/menu/menu.css
index 8ae881f72..51bb32518 100644
--- a/e107_themes/_blank/menu/menu.css
+++ b/e107_themes/_blank/menu/menu.css
@@ -1,5 +1,3 @@
-#nav li.fs-linkSep { width: 2px; margin: 0px; height: 38px; background: url(../images/a01_bar-Sep.png) 0 0 no-repeat; }
-
 #nav, #nav ul { /* all lists */
 	padding: 0px;
 	margin: 0px;
@@ -10,7 +8,7 @@
 
 
 #nav a {
-	padding: 0px 15px 0px 36px;
+	padding: 0px 10px 0px 10px;
 	vertical-align: middle;
 	display: block;
 	font-family: Verdana, Arial, Helvetica, sans-serif;
@@ -36,6 +34,7 @@
 
 #nav li { /* all list items */
 	float: left;
+	line-height: 36px;
 	/* width: 158px;  width needed or else Opera goes nuts */
 }
 ul.sub {border-top: 1px solid #DDDDDD;}
@@ -43,7 +42,7 @@ ul.sub {border-top: 1px solid #DDDDDD;}
 #nav li ul { /* second-level lists */
 	position: absolute;
 	z-index: 10;
-	width: 180px;
+	width: 190px;
 	
 	left: -9999px; /* using left instead of display to hide menus because display: none isn't read by screen readers */
 }
@@ -62,22 +61,24 @@ ul.sub {border-top: 1px solid #DDDDDD;}
 	border-left: 1px solid #DDDDDD;
 	border-right: 1px solid #DDDDDD;
 	border-bottom: 1px solid #DDDDDD;
-	width: 188px;
-	w\idth : 188px;
+	width: 190px;
+	w\idth : 178px;
 	text-transform: none;
 	color: #13394E;
 }
 
-#nav .menuItem img { width: 16px; height: 16px; padding: 6px 0px; margin-right: 10px; }
+#nav .menuButton img { padding: 10px 0px; margin-right: 10px; }
+
+#nav .menuItem img { padding: 6px 0px; margin-right: 10px; }
 #nav li li a.sub,
 #nav li:hover li a.sub,
 #nav li.sfhover li a.sub {
-	/* background-image: url(../images/1008-links_sub.gif) !important ; background-repeat: no-repeat; background-position:95% 50%; */
+	background-image: url(../images/links_sub.gif) !important ; background-repeat: no-repeat; background-position:95% 50%;
 }
 #nav li li a.sub:hover,
 #nav li:hover li a.sub:hover,
 #nav li.sfhover li a.sub:hover {
-	/* background-image: url(../images/0708_link_sub_over.png) !important ; background-repeat: no-repeat; background-position: 100% 50%; */
+	/*background-image: url(../images/link_sub_over.png) !important ; background-repeat: no-repeat; background-position: 100% 50%;*/
 }
 
 
@@ -89,7 +90,8 @@ ul.sub {border-top: 1px solid #DDDDDD;}
 
 
 #nav li ul ul { /* third-and-above-level lists */
-	margin: -29px 0 0 180px;
+	margin: -25px 0 0 120px;
+	border-top: 1px solid #ddd;
 }
 
 #nav li:hover ul ul,