Index: branches/RC/core/admin_templates/groups/groups_edit_users.tpl
===================================================================
diff -u -r11137 -r11538
--- branches/RC/core/admin_templates/groups/groups_edit_users.tpl	(.../groups_edit_users.tpl)	(revision 11137)
+++ branches/RC/core/admin_templates/groups/groups_edit_users.tpl	(.../groups_edit_users.tpl)	(revision 11538)
@@ -1,5 +1,7 @@
+<inp2:adm_SetPopupSize width="750" height="761"/>
+
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:user_groups" prefix="g" grid="GroupUsers" title_preset="groups_edit_users" tabs="groups/groups_edit_tabs"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_groups" prefix="g" grid="GroupUsers" title_preset="groups_edit_users" tab_preset="Default" pagination="1" pagination_prefix="g-ug"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -71,25 +73,20 @@
 				</script>
 
 			</td>
+			<inp2:m_RenderElement name="search_main_toolbar" prefix="g-ug" grid="GroupUsers"/>
 		</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="g-ug" IdField="PortalUserId" grid="GroupUsers" menu_filters="yes" limited_heights="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="g-ug" IdField="PortalUserId" grid="GroupUsers" limited_heights="1"/>
 <script type="text/javascript">
 	Grids['g-ug'].SetDependantToolbarButtons( new Array('delete') );
 	Grids['g-ug'].DblClick = function() {return false};