Index: branches/RC/core/admin_templates/users/user_edit_items.tpl
===================================================================
diff -u -r11538 -r11546
--- branches/RC/core/admin_templates/users/user_edit_items.tpl	(.../user_edit_items.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/user_edit_items.tpl	(.../user_edit_items.tpl)	(revision 11546)
@@ -122,42 +122,33 @@
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <inp2:u_ErrorWarning name="form_error_warning"/>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
-		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
-	<inp2:m_RenderElement name="subsection" title="la_section_Items"/>
-</table>
+<div id="scroll_container" mode="minimal">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
+			<inp2:m_RenderElement name="inp_edit_filler"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Items"/>
+	</table>
+</div>
 <br />
 
 <!-- item tabs: begin -->
-<table cellpadding="0" cellspacing="0">
-	<tr>
-		<inp2:m_DefineElement name="item_tab" title="">
-			<td nowrap="nowrap" width="140">
-				<table id="<inp2:m_param name="prefix"/>.user_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/>.user');">
-					<tr>
-						<td class="catalog-tab-left">
-							<img src="img/spacer.gif" height="22" width="9" />
-						</td>
-						<td class="catalog-tab-middle" width="100%" valign="middle" nowrap="nowrap">
-							<inp2:m_Phrase name="$title"/> <span class="cats_stats">(<span id="<inp2:m_param name="prefix"/>.user_item_count">?</span>)</span>
-						</td>
-		       			<td class="catalog-tab-right">
-		     				<img src="img/spacer.gif" height="22" width="9" />
-						</td>
-						<td style="background-color: #FFFFFF;">
-							<img src="img/spacer.gif" height="1" width="5" />
-						</td>
-					</tr>
-				</table>
+<inp2:m_DefineElement name="item_tab" title="" special=".user">
+	<td class="tab-spacer"><img src="img/spacer.gif" width="3" height="1"/></td>
+	<td id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_tab" class="tab">
+		<img src="<inp2:m_TemplatesBase module='$icon_module'/>/img/itemicons/<inp2:m_Param name='icon'/>" width="16" height="16" align="absmiddle" alt=""/>
+		<a href="#" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/><inp2:m_Param name="special"/>'); return false;" class="tab-link">
+			<inp2:m_Phrase name="$title"/> <span class="cats_stats" style="color: inherit;">(<span id="<inp2:m_param name="prefix"/><inp2:m_Param name="special"/>_item_count">?</span>)</span>
+		</a>
+	</td>
+</inp2:m_DefineElement>
 
-			</td>
-		</inp2:m_DefineElement>
+<inp2:m_DefineElement name="permission_tabs">
+	<inp2:m_ModuleInclude template="user_item_tab" tab_init="2" title_property="ViewMenuPhrase" skip_prefixes="m,adm,cms"/>
+</inp2:m_DefineElement>
 
-		<inp2:m_ModuleInclude template="user_item_tab" tab_init="2" title_property="ViewMenuPhrase" skip_prefixes="m,adm,cms"/>
-	</tr>
-</table>
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="permission_tabs"/>
 <!-- item tabs: end -->
 
 <inp2:m_set ts="user"/>