Index: branches/RC/core/units/users/users_config.php
===================================================================
diff -u -N -r10025 -r10028
--- branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 10025)
+++ branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 10028)
@@ -86,21 +86,36 @@
 						'users_list'		=>	Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#)"),
 
 						'users_edit'		=>	Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_General!"),
-						'users_custom'		=>	Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Custom!"),
+						'user_edit_images' => Array ('prefixes' => Array('u', 'u-img_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Images! (#u-img_recordcount#)"),
+						'user_edit_groups'	=>	Array('prefixes' => Array('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups! (#u-ug_recordcount#)"),
+						'user_edit_custom'		=>	Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Custom!"),
 
-						'users_select'		=>	Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"),
-
-						'user_groups_list'	=>	Array('prefixes' => Array('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups! (#u-ug_recordcount#)"),
-
 						'user_edit_group' => Array (
 							'prefixes' => Array ('u', 'u-ug'),
 							'edit_status_labels' => Array ('u-ug' => '!la_title_EditingMembership!'),
 							'format' => "#u_status# '#u_titlefield#' - #u-ug_status# '#u-ug_titlefield#'",
 						),
 
+						'user_image_edit' => Array (
+							'prefixes' => Array ('u', 'u-img'),
+							'new_status_labels' => Array ('u-img' => '!la_title_Adding_Image!'),
+							'edit_status_labels' => Array ('u-img' => '!la_title_Editing_Image!'),
+							'new_titlefield' => Array ('u-img' => '!la_title_New_Image!'),
+							'format' => "#u_status# '#u_titlefield#' - #u-img_status# '#u-img_titlefield#'",
+						),
+
+						'users_select'		=>	Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"),
 						'tree_users'		=>	Array('format' => '!la_section_overview!'),
 					),
 
+					'EditTabPresets' => Array (
+   						'Default' => Array (
+   							Array ('title' => 'la_tab_General', 't' => 'in-portal/users/users_edit', 'priority' => 1),
+   							Array ('title' => 'la_tab_Groups', 't' => 'in-portal/users/users_edit_groups', 'priority' => 2),
+   							Array ('title' => 'la_tab_Images', 't' => 'in-portal/users/user_edit_images', 'priority' => 3),
+   							Array ('title' => 'la_tab_Custom', 't' => 'in-portal/users/users_edit_custom', 'priority' => 4),
+   						),
+   					),
 
 					'PermSection'		=>	Array('main' => 'in-portal:user_list', 'email' => 'in-portal:user_email', 'custom' => 'in-portal:user_custom'),
 
@@ -124,7 +139,7 @@
 																)
 															),
 
-					'SubItems'		=> Array('addr', 'u-cdata', 'u-ug', 'fav', 'user-profile'),
+					'SubItems'		=> Array('addr', 'u-cdata', 'u-ug', 'u-img', 'fav', 'user-profile'),
 
 					'FilterMenu'		=>	Array(
 												'Groups' => Array(
Index: branches/RC/kernel/admin_templates/users/user_edit_images.tpl
===================================================================
diff -u -N
--- branches/RC/kernel/admin_templates/users/user_edit_images.tpl	(revision 0)
+++ branches/RC/kernel/admin_templates/users/user_edit_images.tpl	(revision 10028)
@@ -0,0 +1,103 @@
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" module="in-portal" title_preset="user_edit_images" tab_preset="Default"/>
+
+<inp2:m_include t="in-portal/incs/image_blocks"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+
+  				function edit()
+	  			{
+	  				std_edit_temp_item('u-img', 'in-portal/users/image_edit');
+	  			}
+
+  				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('u','<inp2:u_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('u','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+
+				a_toolbar.AddButton( new ToolBarButton('new_image', '<inp2:m_phrase label="la_ToolTip_New_Images" escape="1"/>',
+						function() {
+							std_new_item('u-img', 'in-portal/users/image_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('u-img')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('u-img','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('u-img','OnMassMoveDown');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('primary_image', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
+							submit_event('u-img','OnSetPrimary');
+						}
+				 ) );
+
+				  a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="u_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="u_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="u-img" IdField="ImageId" grid="Default" menu_filters="yes"/>
+<script type="text/javascript">
+	Grids['u-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','primary_image') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/units/images/images_config.php
===================================================================
diff -u -N -r8929 -r10028
--- branches/RC/core/units/images/images_config.php	(.../images_config.php)	(revision 8929)
+++ branches/RC/core/units/images/images_config.php	(.../images_config.php)	(revision 10028)
@@ -2,15 +2,17 @@
 
 $config	=	Array(
 					'Prefix'			=>	'img',
-					'Clones'	=> Array(
-											'l-img'	=>	Array('ParentPrefix'	=>	'l'),
-											'n-img'	=>	Array('ParentPrefix'	=>	'n'),
-											'bb-img'=>	Array('ParentPrefix'	=>	'bb'),
-											'bb-post-img'=>	Array('ParentPrefix'	=>	'bb-post'),
-											/*'p-img'	=>	Array('ParentPrefix'	=>	'p'),*/
-											'c-img' => 	Array('ParentPrefix'	=>	'c'),
-									),
+					'Clones'	=> Array (
+						'u-img'	=>	Array('ParentPrefix'	=>	'u'),
 
+						'l-img'	=>	Array('ParentPrefix'	=>	'l'),
+						'n-img'	=>	Array('ParentPrefix'	=>	'n'),
+						'bb-img'=>	Array('ParentPrefix'	=>	'bb'),
+						'bb-post-img'=>	Array('ParentPrefix'	=>	'bb-post'),
+						/*'p-img'	=>	Array('ParentPrefix'	=>	'p'),*/
+						'c-img' => 	Array('ParentPrefix'	=>	'c'),
+					),
+
 					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
 					'EventHandlerClass'	=>	Array('class'=>'ImageEventHandler','file'=>'image_event_handler.php','build_event'=>'OnBuild'),
Index: branches/RC/kernel/units/images/images_config.php
===================================================================
diff -u -N -r8929 -r10028
--- branches/RC/kernel/units/images/images_config.php	(.../images_config.php)	(revision 8929)
+++ branches/RC/kernel/units/images/images_config.php	(.../images_config.php)	(revision 10028)
@@ -2,15 +2,17 @@
 
 $config	=	Array(
 					'Prefix'			=>	'img',
-					'Clones'	=> Array(
-											'l-img'	=>	Array('ParentPrefix'	=>	'l'),
-											'n-img'	=>	Array('ParentPrefix'	=>	'n'),
-											'bb-img'=>	Array('ParentPrefix'	=>	'bb'),
-											'bb-post-img'=>	Array('ParentPrefix'	=>	'bb-post'),
-											/*'p-img'	=>	Array('ParentPrefix'	=>	'p'),*/
-											'c-img' => 	Array('ParentPrefix'	=>	'c'),
-									),
+					'Clones'	=> Array (
+						'u-img'	=>	Array('ParentPrefix'	=>	'u'),
 
+						'l-img'	=>	Array('ParentPrefix'	=>	'l'),
+						'n-img'	=>	Array('ParentPrefix'	=>	'n'),
+						'bb-img'=>	Array('ParentPrefix'	=>	'bb'),
+						'bb-post-img'=>	Array('ParentPrefix'	=>	'bb-post'),
+						/*'p-img'	=>	Array('ParentPrefix'	=>	'p'),*/
+						'c-img' => 	Array('ParentPrefix'	=>	'c'),
+					),
+
 					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
 					'EventHandlerClass'	=>	Array('class'=>'ImageEventHandler','file'=>'image_event_handler.php','build_event'=>'OnBuild'),
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r9853 -r10028
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 9853)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 10028)
@@ -1,4 +1,4 @@
-<inp2:m_DefineElement name="combined_header" permission_type="view" module="" icon="">
+<inp2:m_DefineElement name="combined_header" permission_type="view" tab_preset="" module="" icon="">
 	<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
 	<inp2:m_RequireLogin permissions="{$perm_section}.{$permission_type}" system="1"/>
 	<inp2:m_if check="m_Param" name="prefix" inverse="1"><inp2:adm_SectionInfo section="$section" info="SectionPrefix" result_to_var="prefix"/></inp2:m_if>
@@ -16,6 +16,10 @@
 		<inp2:m_include t="$tabs"/>
 	</inp2:m_if>
 
+	<inp2:m_if check="m_Param" name="tab_preset">
+		<inp2:m_RenderElement name="edit_tabs" prefix="$prefix" preset_name="$tab_preset"/>
+	</inp2:m_if>
+
 	<table cellpadding="0" cellspacing="0" width="100%">
 		<tr>
 			<td class="tablenav">
@@ -686,8 +690,8 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="edit_tabs">
-	<inp2:m_if check="{$prefix}_HasEditTabs" preset_name="Default">
+<inp2:m_DefineElement name="edit_tabs" preset_name="Default">
+	<inp2:m_if check="{$prefix}_HasEditTabs" preset_name="$preset_name">
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
 			<tr>
 				<td align="right" width="100%">
@@ -697,7 +701,7 @@
 								<inp2:m_RenderElement name="tab" title="$title" t="$template" main_prefix="$PrefixSpecial"/>
 							</inp2:m_DefineElement>
 
-							<inp2:{$prefix}_PrintEditTabs render_as="edit_tab" preset_name="Default"/>
+							<inp2:{$prefix}_PrintEditTabs render_as="edit_tab" preset_name="$preset_name"/>
 						</tr>
 					</table>
 				</td>
Index: branches/RC/kernel/admin_templates/users/image_edit.tpl
===================================================================
diff -u -N
--- branches/RC/kernel/admin_templates/users/image_edit.tpl	(revision 0)
+++ branches/RC/kernel/admin_templates/users/image_edit.tpl	(revision 10028)
@@ -0,0 +1,60 @@
+<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<inp2:m_include t="in-portal/incs/image_blocks"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+<inp2:m_RenderElement name="section_header" prefix="u" icon="icon46_users" module="in-portal" title="!la_title_Users!"/>
+
+<inp2:m_RenderElement name="blue_bar" prefix="u" title_preset="user_image_edit" module="in-portal" icon="icon46_users"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('u-img','<inp2:u-img_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('u-img','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
+		<inp2:m_RenderElement name="inp_edit_hidden" prefix="u-img" field="ResourceId"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u-img" field="ImageId" title="!la_fld_ImageId!"/>
+
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Name" title="!la_fld_Name!" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
+
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+
+	<inp2:m_RenderElement name="subsection" title="!la_section_ThumbnailImage!"/>
+		<inp2:m_RenderElement name="thumbnail_section" prefix="u-img"/>
+
+	<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
+		<inp2:m_RenderElement name="fullsize_section" prefix="u-img"/>
+
+</table>
+
+<script type="text/javascript">
+	<inp2:m_RenderElement name="images_edit_js" prefix="u-img"/>
+	toggle_fullsize();
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/kernel/admin_templates/users/users_edit_tabs.tpl
===================================================================
diff -u -N
--- branches/RC/kernel/admin_templates/users/users_edit_tabs.tpl	(revision 8929)
+++ branches/RC/kernel/admin_templates/users/users_edit_tabs.tpl	(revision 0)
@@ -1,13 +0,0 @@
-<table style="padding: 2px 0px 0px 0px; margin: 0px; border: none; border-collapse: collapse" width="100%">
-<tr>
-	<td align="right" width="100%">
-	  	<table cellpadding="0" cellspacing="0" border="0" height="23">
-			<tr>
-				<inp2:m_RenderElement name="tab" title="la_tab_General" t="in-portal/users/users_edit" main_prefix="u"/>
-				<inp2:m_RenderElement name="tab" title="la_tab_Groups" t="in-portal/users/users_edit_groups" main_prefix="u"/>
-				<inp2:m_RenderElement name="tab" title="la_tab_Custom" t="in-portal/users/users_edit_custom" main_prefix="u"/>
-			</tr>
-		</table>
-	</td>
-</tr>
-</table>
\ No newline at end of file
Index: branches/RC/kernel/admin_templates/users/users_edit.tpl
===================================================================
diff -u -N -r8929 -r10028
--- branches/RC/kernel/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 10028)
@@ -1,14 +1,7 @@
-<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
+<inp2:m_include t="incs/header"/>
 
-<inp2:m_include t="incs/header" nobody="yes"/>
-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" module="in-portal" title_preset="users_edit" tab_preset="Default"/>
 
-<inp2:m_RenderElement name="section_header" prefix="u" icon="icon46_users" module="in-portal" title="la_title_Users"/>
-
-<inp2:m_include t="in-portal/users/users_edit_tabs"/>
-
-<inp2:m_RenderElement name="blue_bar" prefix="u" title_preset="users_edit" module="in-portal" icon="icon46_users"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
Index: branches/RC/kernel/admin_templates/users/users_edit_custom.tpl
===================================================================
diff -u -N -r8929 -r10028
--- branches/RC/kernel/admin_templates/users/users_edit_custom.tpl	(.../users_edit_custom.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/users/users_edit_custom.tpl	(.../users_edit_custom.tpl)	(revision 10028)
@@ -1,13 +1,7 @@
-<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
+<inp2:m_include t="incs/header"/>
 
-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
-<inp2:m_RenderElement name="section_header" prefix="u" icon="icon46_usergroups" module="in-portal" title="la_title_Groups"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" module="in-portal" title_preset="user_edit_custom" tab_preset="Default"/>
 
-<inp2:m_include t="in-portal/users/users_edit_tabs"/>
-
-<inp2:m_RenderElement name="blue_bar" prefix="u" title_preset="users_custom" module="in-portal" icon="icon46_usergroups"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
Index: branches/RC/core/kernel/db/dblist.php
===================================================================
diff -u -N -r9907 -r10028
--- branches/RC/core/kernel/db/dblist.php	(.../dblist.php)	(revision 9907)
+++ branches/RC/core/kernel/db/dblist.php	(.../dblist.php)	(revision 10028)
@@ -397,11 +397,11 @@
 
 		if ( preg_match("/DISTINCT(.*?)FROM(?!_)/is",$sql,$regs ) )
 		{
-			$sql = preg_replace("/^.*SELECT DISTINCT(.*?)FROM(?!_)/is", 'SELECT '.$fields.' FROM', $sql);
+			$sql = preg_replace("/^\s*SELECT DISTINCT(.*?)FROM(?!_)/is", 'SELECT '.$fields.' FROM', $sql);
 		}
 		else
 		{
-			$sql = preg_replace("/^.*SELECT(.*?)FROM(?!_)/is", 'SELECT '.$fields.' FROM ', $sql);
+			$sql = preg_replace("/^\s*SELECT(.*?)FROM(?!_)/is", 'SELECT '.$fields.' FROM ', $sql);
 		}
 
 		$totals = $this->Conn->Query($sql);
Index: branches/RC/kernel/admin_templates/users/users_list.tpl
===================================================================
diff -u -N -r10024 -r10028
--- branches/RC/kernel/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 10024)
+++ branches/RC/kernel/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 10028)
@@ -1,12 +1,7 @@
-<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
+<inp2:m_include t="incs/header"/>
 
-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" module="in-portal" title_preset="users_list"/>
 
-<inp2:m_RenderElement name="section_header" prefix="u" icon="icon46_users" module="in-portal" title="la_title_Users"/>
-
-<inp2:m_RenderElement name="blue_bar" prefix="u" title_preset="users_list" icon="icon46_users" module="in-portal"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
Index: branches/RC/kernel/admin_templates/users/users_edit_groups.tpl
===================================================================
diff -u -N -r10025 -r10028
--- branches/RC/kernel/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 10025)
+++ branches/RC/kernel/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 10028)
@@ -1,13 +1,7 @@
-<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+<inp2:m_include t="incs/header"/>
 
-<inp2:m_RenderElement name="section_header" prefix="u" icon="icon46_usergroups" module="in-portal" title="la_title_Groups"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" module="in-portal" title_preset="user_edit_groups" tab_preset="Default"/>
 
-<inp2:m_include t="in-portal/users/users_edit_tabs"/>
-
-<inp2:m_RenderElement name="blue_bar" prefix="u" title_preset="user_groups_list" module="in-portal" icon="icon46_usergroups"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -89,7 +83,7 @@
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="grid_membership_td">
+<inp2:m_DefineElement name="grid_membership_td" format="" no_special="" nl2br="" first_chars="" td_style="">
 	<td valign="top" class="text" style="<inp2:m_param name="td_style"/>">
 		<inp2:m_if check="Field" name="$field" db="db">
 			<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>