Index: branches/RC/core/admin_templates/categories/categories_tabs.tpl
===================================================================
diff -u -N -r11102 -r11520
--- branches/RC/core/admin_templates/categories/categories_tabs.tpl	(.../categories_tabs.tpl)	(revision 11102)
+++ branches/RC/core/admin_templates/categories/categories_tabs.tpl	(.../categories_tabs.tpl)	(revision 11520)
@@ -11,24 +11,18 @@
 </script>
 </inp2:m_DefineElement>
 
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr>
-	<td align="right" width="100%">
-  	<table cellpadding="0" cellspacing="0" border="0" height="23">
-		<tr>
-			<inp2:m_if check="c_IsRootCategory">
-				<inp2:m_RenderElement name="tab" title="la_tab_Permissions" t="categories/categories_edit_permissions" main_prefix="c"/>
-			<inp2:m_else/>
-				<inp2:m_RenderElement name="tab" title="la_tab_General" t="categories/categories_edit" main_prefix="c"/>
-				<inp2:m_RenderElement name="tab" title="la_tab_Properties" t="categories/categories_edit_properties" main_prefix="c"/>
-				<inp2:m_RenderElement name="tab" title="la_tab_Relations" t="categories/categories_edit_relations" main_prefix="c"/>
-				<inp2:m_RenderElement name="tab" title="la_tab_Related_Searches" t="categories/categories_edit_related_searches" main_prefix="c"/>
-				<inp2:m_RenderElement name="tab" title="la_tab_Images" t="categories/categories_edit_images" main_prefix="c"/>
-				<inp2:m_RenderElement name="tab" title="la_tab_Permissions" t="categories/categories_edit_permissions" main_prefix="c"/>
-				<inp2:m_RenderElement name="tab" title="la_tab_Custom" t="categories/categories_edit_custom" main_prefix="c"/>
-			</inp2:m_if>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
\ No newline at end of file
+<inp2:m_DefineElement name="categories_tabs">
+	<inp2:m_if check="c_IsRootCategory">
+		<inp2:m_RenderElement name="tab" title="la_tab_Permissions" t="categories/categories_edit_permissions" main_prefix="c"/>
+	<inp2:m_else/>
+		<inp2:m_RenderElement name="tab" title="la_tab_General" t="categories/categories_edit" main_prefix="c"/>
+		<inp2:m_RenderElement name="tab" title="la_tab_Properties" t="categories/categories_edit_properties" main_prefix="c"/>
+		<inp2:m_RenderElement name="tab" title="la_tab_Relations" t="categories/categories_edit_relations" main_prefix="c"/>
+		<inp2:m_RenderElement name="tab" title="la_tab_Related_Searches" t="categories/categories_edit_related_searches" main_prefix="c"/>
+		<inp2:m_RenderElement name="tab" title="la_tab_Images" t="categories/categories_edit_images" main_prefix="c"/>
+		<inp2:m_RenderElement name="tab" title="la_tab_Permissions" t="categories/categories_edit_permissions" main_prefix="c"/>
+		<inp2:m_RenderElement name="tab" title="la_tab_Custom" t="categories/categories_edit_custom" main_prefix="c"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="categories_tabs"/>