Index: branches/5.1.x/core/admin_templates/categories/categories_edit_custom.tpl
===================================================================
diff -u -N -r14241 -r14408
--- branches/5.1.x/core/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 14241)
+++ branches/5.1.x/core/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 14408)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_include t="categories/categories_tabs"/>
 
-<inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" title_preset="categories_custom" grid="SeparateTab" tab_preset="Default"/>
+<inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" title_preset="categories_custom" tab_preset="Default"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -51,23 +51,23 @@
 			</script>
 		</td>
 
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="cf" grid="SeparateTab"/>
+		<inp2:m_RenderElement name="ml_selector" prefix="c"/>
 	</tr>
 </tbody>
 </table>
 
+<inp2:c_SaveWarning name="grid_save_warning"/>
+<inp2:c_ErrorWarning name="form_error_warning"/>
+
 <inp2:m_include t="incs/custom_blocks"/>
-<inp2:m_RenderElement
-	name="grid"
-	PrefixSpecial="cf"
-	SourcePrefix="c"
-	value_field="Value"
-	IdField="CustomFieldId"
-	per_page="-1"
-	grid="SeparateTab"
-	header_block="grid_column_title_no_sorting"
-	no_init="no_init"
-	/>
 
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:cf.all_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" original_title="la_section_OriginalValues"/>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
 <input type="hidden" name="cf_type" value="<inp2:c_UnitOption name='ItemType'/>"/>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file