Index: branches/5.1.x/admin_templates/currencies/currencies_edit.tpl
===================================================================
diff -u -N -r13100 -r13923
--- branches/5.1.x/admin_templates/currencies/currencies_edit.tpl	(.../currencies_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/currencies/currencies_edit.tpl	(.../currencies_edit.tpl)	(revision 13923)
@@ -59,29 +59,21 @@
 			<inp2:m_RenderElement name="inp_label" prefix="curr" field="CurrencyId" title="!la_fld_Id!"/>
 			<inp2:m_RenderElement name="inp_label" prefix="curr" field="ISO" title="!la_fld_ISOCode!"/>
 
-			<inp2:m_if check="curr_FieldVisible" field="RateToPrimary">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="RateToPrimary" title="!la_fld_RateToPrimary!" />
-					<td class="control-cell">
-						<input type="text" name="<inp2:curr_InputName field='RateToPrimary'/>" id="<inp2:curr_InputName field='RateToPrimary'/>" value="<inp2:curr_Field field='RateToPrimary'/>" size="10">
-						<input type="button" class="button" onclick="submit_event('curr', 'OnUpdateRate')" value="<inp2:m_phrase label='la_UpdateRate'/>">
-						<span class="small">1 <inp2:curr_Field field="ISO"/> = ? <inp2:curr_PrimaryCurrencyISO /></span>
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="curr" field="RateToPrimary"/>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="curr" field="RateToPrimary" title="la_fld_RateToPrimary">
+				<td class="control-cell">
+					<input type="text" name="<inp2:curr_InputName field='RateToPrimary'/>" id="<inp2:curr_InputName field='RateToPrimary'/>" value="<inp2:curr_Field field='RateToPrimary'/>" size="10">
+					<input type="button" class="button" onclick="submit_event('curr', 'OnUpdateRate')" value="<inp2:m_phrase label='la_UpdateRate'/>">
+					<span class="small">1 <inp2:curr_Field field="ISO"/> = ? <inp2:curr_PrimaryCurrencyISO /></span>
+				</td>
+			</inp2:m_RenderElement>
 
-			<inp2:m_if check="curr_FieldVisible" field="Symbol">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="Symbol" title="!la_fld_CurrencySymbol!"/>
-					<td class="control-cell">
-						<input type="text" name="<inp2:curr_InputName field='Symbol'/>" id="<inp2:curr_InputName field='Symbol'/>" value="<inp2:curr_Field field='Symbol'/>" tabindex="<inp2:m_get param='tab_index'/>" size="10">
-						<span class="small"><inp2:m_phrase label="la_ISOUsedIfBlank" /></span>
-						<inp2:curr_Error field="Symbol"/>
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="curr" field="Symbol"/>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="curr" field="Symbol" title="la_fld_CurrencySymbol">
+				<td class="control-cell">
+					<input type="text" name="<inp2:curr_InputName field='Symbol'/>" id="<inp2:curr_InputName field='Symbol'/>" value="<inp2:curr_Field field='Symbol'/>" tabindex="<inp2:m_get param='tab_index'/>" size="10">
+					<span class="small"><inp2:m_phrase label="la_ISOUsedIfBlank" /></span>
+					<inp2:curr_Error field="Symbol"/>
+				</td>
+			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="curr" field="SymbolPosition" title="!la_fld_CurrencySymbolPosition!"/>