diff --git a/root/includes/acp/acp_portal.php b/root/includes/acp/acp_portal.php
index 88c137d1..d0179ece 100644
--- a/root/includes/acp/acp_portal.php
+++ b/root/includes/acp/acp_portal.php
@@ -47,6 +47,7 @@ class acp_portal
 						'portal_advanced_stat'				=> array('lang' => 'PORTAL_ADVANCED_STAT'	, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
 						'portal_search'						=> array('lang' => 'PORTAL_SEARCH'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
 						'portal_leaders'					=> array('lang' => 'PORTAL_LEADERS'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
+						'portal_leaders_ext'				=> array('lang' => 'PORTAL_LEADERS_EXT'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
 						'portal_clock'						=> array('lang' => 'PORTAL_CLOCK'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
 						'portal_link_us'					=> array('lang' => 'PORTAL_LINK_US'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
 						'portal_birthdays'					=> array('lang' => 'PORTAL_BIRTHDAYS'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
diff --git a/root/install_portal/schemas/_schema_data.sql b/root/install_portal/schemas/_schema_data.sql
index 1dede7a7..2cc2f5d7 100644
--- a/root/install_portal/schemas/_schema_data.sql
+++ b/root/install_portal/schemas/_schema_data.sql
@@ -86,5 +86,8 @@ INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_news
 INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_announcements_archive', '1');
 INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_links_array', 'a:2:{i:1;a:2:{s:4:"text";s:9:"Board3.de";s:3:"url";s:21:"http://www.board3.de/";}i:2;a:2:{s:4:"text";s:9:"phpBB.com";s:3:"url";s:21:"http://www.phpbb.com/";}}');
 
+# Version 1.0.0RC2 #
+INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_leaders_ext', '0');
+
 # POSTGRES COMMIT #
 
diff --git a/root/install_portal/schemas/update_schema.php b/root/install_portal/schemas/update_schema.php
index 5f4c51b9..9ce942cd 100644
--- a/root/install_portal/schemas/update_schema.php
+++ b/root/install_portal/schemas/update_schema.php
@@ -55,6 +55,7 @@ $mod_update['0.3.0'] = array(
 $sql_update['1.0.0RC2'] = array(
 	"UPDATE phpbb_portal_config SET config_name = 'portal_right_column_width' WHERE config_name = 'portal_right_collumn_width'",
 	"UPDATE phpbb_portal_config SET config_name = 'portal_left_column_width' WHERE config_name = 'portal_left_collumn_width'",
+	"INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_leaders_ext', '0');",
 );
 
 ?>
\ No newline at end of file
diff --git a/root/language/de/mods/lang_portal.php b/root/language/de/mods/lang_portal.php
index 289b95ec..bc17b89d 100644
--- a/root/language/de/mods/lang_portal.php
+++ b/root/language/de/mods/lang_portal.php
@@ -158,8 +158,9 @@ $lang = array_merge($lang, array(
 	'STYLE_CHOOSE'					=> 'Wähle einen Style',
 		
 	// team
-	'NO_ADMINISTRATORS_P'		=> 'Keine Administratoren',
-	'NO_MODERATORS_P'				=> 'Keine Moderatoren',
+	'NO_ADMINISTRATORS_P'	=> 'Keine Administratoren',
+	'NO_MODERATORS_P'		=> 'Keine Moderatoren',
+	'NO_GROUPS_P'			=> 'Keine Groupen',
 
 	// average Statistics
 	'TOPICS_PER_DAY_OTHER'		=> 'Themen pro Tag: <strong>%d</strong>',
diff --git a/root/language/de/mods/lang_portal_acp.php b/root/language/de/mods/lang_portal_acp.php
index c1b0a733..3ba6c294 100644
--- a/root/language/de/mods/lang_portal_acp.php
+++ b/root/language/de/mods/lang_portal_acp.php
@@ -48,6 +48,8 @@ $lang = array_merge($lang, array(
 	'PORTAL_ADVANCED_STAT_EXPLAIN'				=> 'Diesen Block auf dem Portal anzeigen.',
 	'PORTAL_LEADERS'									=> 'Team',
 	'PORTAL_LEADERS_EXPLAIN'							=> 'Diesen Block auf dem Portal anzeigen.',
+	'PORTAL_LEADERS_EXT'					=> 'Extended Leaders / Team',
+	'PORTAL_LEADERS_EXT_EXPLAIN'			=> 'The standard block lists all admins/mods, while the extended block lists all non-hidden groups with a legend.',
 	'PORTAL_CLOCK'										=> 'Uhr',
 	'PORTAL_CLOCK_EXPLAIN'							=> 'Die Uhr auf dem Portal anzeigen.',
 	'PORTAL_LINK_US'									=> 'Verlink uns',
diff --git a/root/language/en/mods/lang_portal.php b/root/language/en/mods/lang_portal.php
index 5edd12c6..fbe46215 100644
--- a/root/language/en/mods/lang_portal.php
+++ b/root/language/en/mods/lang_portal.php
@@ -166,8 +166,9 @@ $lang = array_merge($lang, array(
 	'STYLE_CHOOSE'			=> 'Select a style',
 		
 	// team
-	'NO_ADMINISTRATORS_P'	=> 'No administrators',
-	'NO_MODERATORS_P'		=> 'No moderators',
+	'NO_ADMINISTRATORS_P'	=> 'No Administrators',
+	'NO_MODERATORS_P'		=> 'No Moderators',
+	'NO_GROUPS_P'			=> 'No Groups',
 
 	// average Statistics
 	'TOPICS_PER_DAY_OTHER'	=> 'Topics per day: <strong>%d</strong>',
diff --git a/root/language/en/mods/lang_portal_acp.php b/root/language/en/mods/lang_portal_acp.php
index d4286b37..a6f03132 100644
--- a/root/language/en/mods/lang_portal_acp.php
+++ b/root/language/en/mods/lang_portal_acp.php
@@ -42,13 +42,15 @@ $lang = array_merge($lang, array(
 	// general
 	'ACP_PORTAL_GENERAL_INFO'				=> 'Portal administration',
 	'ACP_PORTAL_GENERAL_INFO_EXPLAIN'		=> 'Thank you for choosing board3 Portal. On this page you can manage the portal of your board. The screens inhere will give you a quick overview of all the various portal settings. The links on the left hand side of this screen allow you to control every aspect of your portal experience.',
-	'ACP_PORTAL_VERSION'						=> '<strong>Board3 Portal Version v%s</strong>',
+	'ACP_PORTAL_VERSION'					=> '<strong>Board3 Portal Version v%s</strong>',
 	'ACP_PORTAL_GENERAL_SETTINGS'			=> 'General settings',
 	'ACP_PORTAL_GENERAL_SETTINGS_EXPLAIN'	=> 'Here you can change your general and certain specific options.',
 	'PORTAL_ADVANCED_STAT'					=> 'Advanced statistics block',
 	'PORTAL_ADVANCED_STAT_EXPLAIN'			=> 'Display this block on the portal.',
-	'PORTAL_LEADERS'						=> 'Leaders / team block',
+	'PORTAL_LEADERS'						=> 'Leaders / Team block',
 	'PORTAL_LEADERS_EXPLAIN'				=> 'Display this block on the portal.',
+	'PORTAL_LEADERS_EXT'					=> 'Extended Leaders / Team',
+	'PORTAL_LEADERS_EXT_EXPLAIN'			=> 'The standard block lists all admins/mods, while the extended block lists all non-hidden groups with a legend.',
 	'PORTAL_CLOCK'							=> 'Clock block',
 	'PORTAL_CLOCK_EXPLAIN'					=> 'Display this block on the portal.',
 	'PORTAL_LINK_US'						=> 'Link us block',
@@ -61,10 +63,10 @@ $lang = array_merge($lang, array(
 	'PORTAL_SEARCH_EXPLAIN'					=> 'Display this block on the portal.',
 	'PORTAL_WELCOME'						=> 'Welcome center block',
 	'PORTAL_WELCOME_EXPLAIN'				=> 'Display this block on the portal.',
-	'PORTAL_WHOIS_ONLINE'							=> 'Who is online?',
-	'PORTAL_WHOIS_ONLINE_EXPLAIN'					=> 'Display this block on the portal.',
-	'PORTAL_CHANGE_STYLE'							=> 'Styleswitcher',
-	'PORTAL_CHANGE_STYLE_EXPLAIN'					=> 'Display this block on the portal.<br /><span style="color:red">Please note:</span> If "Override user style:" in the board settings is set to "Yes", this block <strong>will not be displayed</strong>, independent of this setting.',
+	'PORTAL_WHOIS_ONLINE'					=> 'Who is online?',
+	'PORTAL_WHOIS_ONLINE_EXPLAIN'			=> 'Display this block on the portal.',
+	'PORTAL_CHANGE_STYLE'					=> 'Styleswitcher',
+	'PORTAL_CHANGE_STYLE_EXPLAIN'			=> 'Display this block on the portal.<br /><span style="color:red">Please note:</span> If "Override user style:" in the board settings is set to "Yes", this block <strong>will not be displayed</strong>, independent of this setting.',
 	'PORTAL_FRIENDS'						=> 'Friends block',
 	'PORTAL_FRIENDS_EXPLAIN'				=> 'Display this block on the portal.',
 	'PORTAL_MAX_ONLINE_FRIENDS'				=> 'Limit of displayed online friends',
@@ -73,8 +75,8 @@ $lang = array_merge($lang, array(
 	'PORTAL_MAIN_MENU_EXPLAIN'				=> 'Display this block on the portal.',
 	'PORTAL_USER_MENU'						=> 'User menu / Login box',
 	'PORTAL_USER_MENU_EXPLAIN'				=> 'Display this block on the portal.',
-	'PORTAL_FORUM_INDEX'							=> 'Forum Index (Forum list)',
-	'PORTAL_FORUM_INDEX_EXPLAIN'					=> 'Display this block on the portal.',
+	'PORTAL_FORUM_INDEX'					=> 'Forum Index (Forum list)',
+	'PORTAL_FORUM_INDEX_EXPLAIN'			=> 'Display this block on the portal.',
 
 	// random member
 	'PORTAL_RANDOM_MEMBER'					=> 'Random member block',
@@ -189,12 +191,12 @@ $lang = array_merge($lang, array(
 	'PORTAL_MAX_MOST_POSTER_EXPLAIN'			=> '0 means infinite',
 
 	// left and right column width 
-	'ACP_PORTAL_COLUMN_WIDTH_INFO'				=> 'Column width',
-	'ACP_PORTAL_COLUMN_WIDTH_SETTINGS'			=> 'Left and right column width settings',
-	'PORTAL_LEFT_COLUMN_WIDTH'					=> 'Width value of the left column',
-	'PORTAL_LEFT_COLUMN_WIDTH_EXPLAIN'			=> 'Change the width of left column in pixel, recommended value 180',
-	'PORTAL_RIGHT_COLUMN_WIDTH'				=> 'Width value of the right column',
-	'PORTAL_RIGHT_COLUMN_WIDTH_EXPLAIN'		=> 'Change the width of right column in pixel, recommended value 180',
+	'ACP_PORTAL_COLUMN_WIDTH_INFO'		=> 'Column width',
+	'ACP_PORTAL_COLUMN_WIDTH_SETTINGS'	=> 'Left and right column width settings',
+	'PORTAL_LEFT_COLUMN_WIDTH'			=> 'Width value of the left column',
+	'PORTAL_LEFT_COLUMN_WIDTH_EXPLAIN'	=> 'Change the width of left column in pixel, recommended value 180',
+	'PORTAL_RIGHT_COLUMN_WIDTH'			=> 'Width value of the right column',
+	'PORTAL_RIGHT_COLUMN_WIDTH_EXPLAIN'	=> 'Change the width of right column in pixel, recommended value 180',
 
 	// attachments    
 	'ACP_PORTAL_ATTACHMENTS_NUMBER_INFO'				=> 'Attachments',
@@ -204,7 +206,7 @@ $lang = array_merge($lang, array(
 	'PORTAL_ATTACHMENTS_EXPLAIN'						=> 'Display this block on the portal.',
 	'PORTAL_ATTACHMENTS_NUMBER'							=> 'Limit of displayed attachments',
 	'PORTAL_ATTACHMENTS_NUMBER_EXPLAIN'					=> '0 means infinite',
-	'PORTAL_ATTACHMENTS_FORUM_IDS'							=> 'Attachments forum id(s)',
+	'PORTAL_ATTACHMENTS_FORUM_IDS'						=> 'Attachments forum id(s)',
 	'PORTAL_ATTACHMENTS_FORUM_IDS_EXPLAIN'				=> 'The id(s) of the forums from which the attachments should be displayed. Use a comma to separate multiple forums, or leave blank to use all available forums.',
 	
 	// friends
@@ -250,27 +252,27 @@ $lang = array_merge($lang, array(
 	'PORTAL_LINK_ADD'					=> '<strong>Add</strong>',
 
 	// custom
-	'ACP_PORTAL_CUSTOM_INFO'								=> 'Custom block',
-	'ACP_PORTAL_CUSTOM_SETTINGS'							=> 'Custom blocks settings',
-	'ACP_PORTAL_CUSTOM_SETTINGS_EXPLAIN'				=> 'Here you can change your custom blocks. These blocks could be filled with HTML or BBCode for several purposes like advertisement, videos, images, flash or text. Just insert the needed code.',
-	'ACP_PORTAL_CUSTOM_SMALL_SETTINGS'							=> 'Custom blocks settings for the small block',
-	'PORTAL_CUSTOM_SMALL_HEADLINE'						=> 'Headline for the small custom block',
-	'PORTAL_CUSTOM_SMALL_HEADLINE_EXPLAIN'				=> 'Here you can change the headline for the small custom block.',
-	'PORTAL_CUSTOM_SMALL'									=> 'Display the small custom block',
-	'PORTAL_CUSTOM_SMALL_EXPLAIN'							=> 'Display this block on the portal.',
-	'PORTAL_CUSTOM_SMALL_BBCODE'							=> 'Activate BBCode for the small custom Block',
-	'PORTAL_CUSTOM_SMALL_BBCODE_EXPLAIN'				=> 'BBCode could be used in this Box. If BBCode is not activated, HTML will be parsed.',
-	'PORTAL_CUSTOM_CODE_SMALL'							=> 'Code for the small custom block',
-	'PORTAL_CUSTOM_CODE_SMALL_EXPLAIN'					=> 'Change the Code for the small custom Block (HTML or BBCode) here.',
-	'ACP_PORTAL_CUSTOM_CENTER_SETTINGS'							=> 'Custom blocks settings for the center block',
-	'PORTAL_CUSTOM_CENTER'									=> 'Display the center custom block',
-	'PORTAL_CUSTOM_CENTER_EXPLAIN'						=> 'Display this block on the portal.',
-	'PORTAL_CUSTOM_CENTER_HEADLINE'						=> 'Headline for the center custom block',
-	'PORTAL_CUSTOM_CENTER_HEADLINE_EXPLAIN'			=> 'Here you can change the headline for the center custom block.',
-	'PORTAL_CUSTOM_CENTER_BBCODE'						=> 'Activate BBCode for the center custom Block',
-	'PORTAL_CUSTOM_CENTER_BBCODE_EXPLAIN'				=> 'BBCode could be used in this Box. If BBCode is not activated, HTML will be parsed.',
-	'PORTAL_CUSTOM_CODE_CENTER'							=> 'Code for the center custom block',
-	'PORTAL_CUSTOM_CODE_CENTER_EXPLAIN'				=> 'Change the Code for the small custom Block (HTML or BBCode) here.',
+	'ACP_PORTAL_CUSTOM_INFO'				=> 'Custom block',
+	'ACP_PORTAL_CUSTOM_SETTINGS'			=> 'Custom blocks settings',
+	'ACP_PORTAL_CUSTOM_SETTINGS_EXPLAIN'	=> 'Here you can change your custom blocks. These blocks could be filled with HTML or BBCode for several purposes like advertisement, videos, images, flash or text. Just insert the needed code.',
+	'ACP_PORTAL_CUSTOM_SMALL_SETTINGS'		=> 'Custom blocks settings for the small block',
+	'PORTAL_CUSTOM_SMALL_HEADLINE'			=> 'Headline for the small custom block',
+	'PORTAL_CUSTOM_SMALL_HEADLINE_EXPLAIN'	=> 'Here you can change the headline for the small custom block.',
+	'PORTAL_CUSTOM_SMALL'					=> 'Display the small custom block',
+	'PORTAL_CUSTOM_SMALL_EXPLAIN'			=> 'Display this block on the portal.',
+	'PORTAL_CUSTOM_SMALL_BBCODE'			=> 'Activate BBCode for the small custom Block',
+	'PORTAL_CUSTOM_SMALL_BBCODE_EXPLAIN'	=> 'BBCode could be used in this Box. If BBCode is not activated, HTML will be parsed.',
+	'PORTAL_CUSTOM_CODE_SMALL'				=> 'Code for the small custom block',
+	'PORTAL_CUSTOM_CODE_SMALL_EXPLAIN'		=> 'Change the Code for the small custom Block (HTML or BBCode) here.',
+	'ACP_PORTAL_CUSTOM_CENTER_SETTINGS'		=> 'Custom blocks settings for the center block',
+	'PORTAL_CUSTOM_CENTER'					=> 'Display the center custom block',
+	'PORTAL_CUSTOM_CENTER_EXPLAIN'			=> 'Display this block on the portal.',
+	'PORTAL_CUSTOM_CENTER_HEADLINE'			=> 'Headline for the center custom block',
+	'PORTAL_CUSTOM_CENTER_HEADLINE_EXPLAIN'	=> 'Here you can change the headline for the center custom block.',
+	'PORTAL_CUSTOM_CENTER_BBCODE'			=> 'Activate BBCode for the center custom Block',
+	'PORTAL_CUSTOM_CENTER_BBCODE_EXPLAIN'	=> 'BBCode could be used in this Box. If BBCode is not activated, HTML will be parsed.',
+	'PORTAL_CUSTOM_CODE_CENTER'				=> 'Code for the center custom block',
+	'PORTAL_CUSTOM_CODE_CENTER_EXPLAIN'		=> 'Change the Code for the small custom Block (HTML or BBCode) here.',
 
 	// minicalendar
 	'ACP_PORTAL_MINICALENDAR_INFO'				=> 'Mini calendar',
diff --git a/root/portal.php b/root/portal.php
index 1f219f5a..8cb23355 100644
--- a/root/portal.php
+++ b/root/portal.php
@@ -183,7 +183,11 @@ if ($portal_config['portal_link_us'])
 	include($phpbb_root_path . 'portal/block/link_us.'.$phpEx);
 }
 
-if ($portal_config['portal_leaders'])
+if ($portal_config['portal_leaders'] && $portal_config['portal_leaders_ext'])
+{
+	include($phpbb_root_path . 'portal/block/leaders_ext.'.$phpEx);
+}
+elseif ($portal_config['portal_leaders'])
 {
 	include($phpbb_root_path . 'portal/block/leaders.'.$phpEx);
 }
diff --git a/root/styles/prosilver/template/portal/portal_body.html b/root/styles/prosilver/template/portal/portal_body.html
index 4c3cd7d4..ad700199 100644
--- a/root/styles/prosilver/template/portal/portal_body.html
+++ b/root/styles/prosilver/template/portal/portal_body.html
@@ -143,15 +143,15 @@
 	<td valign="top" style="width: {PORTAL_RIGHT_COLUMN}px; padding-left:6px;">
 		<br style="clear:both" />
 
-	<!-- IF S_DISPLAY_USERMENU -->
-		<!-- IF not S_USER_LOGGED_IN -->
-			<!-- INCLUDE portal/block/login_box.html -->
-		<!-- ENDIF -->
+		<!-- IF S_DISPLAY_USERMENU -->
+			<!-- IF not S_USER_LOGGED_IN -->
+				<!-- INCLUDE portal/block/login_box.html -->
+			<!-- ENDIF -->
 
-		<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
-			<!-- INCLUDE portal/block/user_menu.html -->
+			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
+				<!-- INCLUDE portal/block/user_menu.html -->
+			<!-- ENDIF -->
 		<!-- ENDIF -->
-	<!-- ENDIF -->
 
 		<!-- IF not S_IS_BOT and S_USER_LOGGED_IN and S_ZEBRA_ENABLED and S_DISPLAY_FRIENDS -->
 			<!-- INCLUDE portal/block/online_friends.html -->
@@ -165,11 +165,13 @@
 			<!-- INCLUDE portal/block/mini_calendar.html -->
 		<!-- ENDIF -->
 		
-		<!-- IF S_DISPLAY_LEADERS -->
+		<!-- IF S_DISPLAY_LEADERS_EXT -->
+			<!-- INCLUDE portal/block/leaders_ext.html -->
+		<!-- ELSEIF S_DISPLAY_LEADERS -->
 			<!-- INCLUDE portal/block/leaders.html -->
 		<!-- ENDIF -->
 		
-          <!-- IF S_DISPLAY_LAST_BOTS and S_LAST_VISITED_BOTS -->
+        <!-- IF S_DISPLAY_LAST_BOTS and S_LAST_VISITED_BOTS -->
 			<!-- INCLUDE portal/block/latest_bots.html -->
 		<!-- ENDIF -->
 
diff --git a/root/styles/subsilver2/template/portal/portal_body.html b/root/styles/subsilver2/template/portal/portal_body.html
index e192d3c6..638e85f1 100644
--- a/root/styles/subsilver2/template/portal/portal_body.html
+++ b/root/styles/subsilver2/template/portal/portal_body.html
@@ -178,18 +178,16 @@ small, .small {
 
 <!-- [+] right block area -->
 	<td width="{PORTAL_RIGHT_COLUMN}px" valign="top" style="padding-left:6px;">
+		<!-- IF S_DISPLAY_USERMENU -->
+			<!-- IF not S_USER_LOGGED_IN -->
+				<!-- INCLUDE portal/block/login_box.html -->
+			<!-- ENDIF -->
 
-
-	<!-- IF S_DISPLAY_USERMENU -->
-		<!-- IF not S_USER_LOGGED_IN -->
-			<!-- INCLUDE portal/block/login_box.html -->
+			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
+				<!-- INCLUDE portal/block/user_menu.html -->
+			<!-- ENDIF -->
 		<!-- ENDIF -->
 
-		<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
-			<!-- INCLUDE portal/block/user_menu.html -->
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-
 		<!-- IF not S_IS_BOT and S_USER_LOGGED_IN and S_ZEBRA_ENABLED and S_DISPLAY_FRIENDS -->
 			<!-- INCLUDE portal/block/online_friends.html -->
 		<!-- ENDIF -->
@@ -202,11 +200,13 @@ small, .small {
 			<!-- INCLUDE portal/block/mini_calendar.html -->
 		<!-- ENDIF -->
 
-		<!-- IF S_DISPLAY_LEADERS -->
+		<!-- IF S_DISPLAY_LEADERS_EXT -->
+			<!-- INCLUDE portal/block/leaders_ext.html -->
+		<!-- ELSEIF S_DISPLAY_LEADERS -->
 			<!-- INCLUDE portal/block/leaders.html -->
 		<!-- ENDIF -->		
 
-          <!-- IF S_DISPLAY_LAST_BOTS and S_LAST_VISITED_BOTS -->
+        <!-- IF S_DISPLAY_LAST_BOTS and S_LAST_VISITED_BOTS -->
 			<!-- INCLUDE portal/block/latest_bots.html -->
 		<!-- ENDIF -->