Index: branches/RC/core/admin_templates/users/users_edit_groups.tpl
===================================================================
diff -u -r11166 -r11538
--- branches/RC/core/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11166)
+++ branches/RC/core/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11538)
@@ -1,11 +1,8 @@
+<inp2:adm_SetPopupSize width="720" height="500"/>
+
 <inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_groups" tab_preset="Default" pagination="1" pagination_prefix="u-ug"/>
 
-<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
-	<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_groups" tab_preset="Default"/>
-<inp2:m_else/>
-	<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_groups" tab_preset="RegularUsers"/>
-</inp2:m_if>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -83,24 +80,20 @@
 			</script>
 
 		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="u-ug" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="grid_membership_platform_td">
+<inp2:m_DefineElement name="grid_membership_td">
 	<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"/>
 	<inp2:m_else/>
 		<inp2:m_phrase name="la_NeverExpires"/>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_membership_td" td_style="">
-	<td valign="top" class="text" style="<inp2:m_param name="td_style"/>">
-		<inp2:m_RenderElement name="grid_membership_platform_td" pass_params="1"/>
-	</td>
-</inp2:m_DefineElement>
-
 <inp2:m_RenderElement name="grid" PrefixSpecial="u-ug" IdField="GroupId" grid="Default" limited_heights="1"/>
 <script type="text/javascript">
 	Grids['u-ug'].SetDependantToolbarButtons( new Array('delete', 'edit', 'primary_group') );