Index: branches/5.2.x/admin_templates/links/links_custom.tpl
===================================================================
diff -u -N -r14254 -r14583
--- branches/5.2.x/admin_templates/links/links_custom.tpl	(.../links_custom.tpl)	(revision 14254)
+++ branches/5.2.x/admin_templates/links/links_custom.tpl	(.../links_custom.tpl)	(revision 14583)
@@ -2,7 +2,7 @@
 
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_RenderElement name="combined_header" prefix="l" section="in-portal:browse" grid="SeparateTab" title_preset="links_custom" tab_preset="Default"/>
+<inp2:m_RenderElement name="combined_header" prefix="l" section="in-portal:browse" title_preset="links_custom" tab_preset="Default"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -50,22 +50,24 @@
 			</script>
 		</td>
 
-		<inp2:m_if check="l_DisplayOriginal" display_original="1">
-			<inp2:m_RenderElement name="search_main_toolbar" prefix="cf" grid="SeparateTabOriginal"/>
-		<inp2:m_else/>
-			<inp2:m_RenderElement name="search_main_toolbar" prefix="cf" grid="SeparateTab"/>
-		</inp2:m_if>
+		<inp2:m_RenderElement name="ml_selector" prefix="l"/>
 	</tr>
 </tbody>
 </table>
 
+<inp2:l_SaveWarning name="grid_save_warning"/>
+<inp2:l_ErrorWarning name="form_error_warning"/>
+
 <inp2:m_include t="incs/custom_blocks"/>
-<inp2:m_if check="l_DisplayOriginal" display_original="1">
-	<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" SourcePrefix="l" value_field="Value" per_page="-1" grid="SeparateTabOriginal" header_block="grid_column_title_no_sorting" no_init="no_init" original_title="la_section_OriginalValues" display_original="1"/>
-<inp2:m_else/>
-	<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" SourcePrefix="l" value_field="Value" per_page="-1" grid="SeparateTab" header_block="grid_column_title_no_sorting" no_init="no_init"/>
-</inp2:m_if>
 
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:cf.all_PrintList render_as="cv_row_block" SourcePrefix="l" value_field="Value" per_page="-1" grid="Default" original_title="la_section_OriginalValues" display_original="1"/>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
 <input type="hidden" name="cf_type" value="<inp2:l_UnitOption name='ItemType'/>"/>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file