Index: branches/RC/core/admin_templates/users/image_edit.tpl
===================================================================
diff -u -N -r11141 -r11538
--- branches/RC/core/admin_templates/users/image_edit.tpl	(.../image_edit.tpl)	(revision 11141)
+++ branches/RC/core/admin_templates/users/image_edit.tpl	(.../image_edit.tpl)	(revision 11538)
@@ -26,27 +26,33 @@
 </tbody>
 </table>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
-		<inp2:m_RenderElement name="inp_edit_hidden" prefix="u-img" field="ResourceId"/>
-		<inp2:m_RenderElement name="inp_label" prefix="u-img" field="ImageId" title="!la_fld_ImageId!"/>
+<inp2:u-img_SaveWarning name="grid_save_warning"/>
+<inp2:u-img_ErrorWarning name="form_error_warning"/>
 
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Name" title="!la_fld_Name!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="u-img" field="ResourceId"/>
+			<inp2:m_RenderElement name="inp_label" prefix="u-img" field="ImageId" title="!la_fld_ImageId!"/>
 
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Name" title="!la_fld_Name!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
 
-	<inp2:m_RenderElement name="subsection" title="!la_section_ThumbnailImage!"/>
-		<inp2:m_RenderElement name="thumbnail_section" prefix="u-img"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Priority" title="!la_fld_Priority!" size="5"/>
 
-	<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
-		<inp2:m_RenderElement name="fullsize_section" prefix="u-img"/>
+		<inp2:m_RenderElement name="subsection" title="!la_section_ThumbnailImage!"/>
+			<inp2:m_RenderElement name="thumbnail_section" prefix="u-img"/>
 
-</table>
+		<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
+			<inp2:m_RenderElement name="fullsize_section" prefix="u-img"/>
 
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
 <script type="text/javascript">
 	<inp2:m_RenderElement name="images_edit_js" prefix="u-img"/>
 	toggle_fullsize();