Index: branches/5.2.x/admin_templates/products/option_edit.tpl
===================================================================
diff -u -N -r14258 -r14569
--- branches/5.2.x/admin_templates/products/option_edit.tpl	(.../option_edit.tpl)	(revision 14258)
+++ branches/5.2.x/admin_templates/products/option_edit.tpl	(.../option_edit.tpl)	(revision 14569)
@@ -20,7 +20,35 @@
 						}
 				 ) );
 
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						PrepareData();
+						go_to_id('po', '<inp2:po_PrevId/>');
+					}
+				));
+	
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						PrepareData();
+						go_to_id('po', '<inp2:po_NextId/>');
+					}
+				));
+	
 				a_toolbar.Render();
+
+				<inp2:m_if check="po_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');					
+				<inp2:m_else/>
+					<inp2:m_if check="po_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="po_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+				
 			</script>
 		</td>
 	</tr>
@@ -270,7 +298,7 @@
 
 	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 		<inp2:m_inc param="tab_index" by="1"/>
-		<td class="label-cell">&nbsp;</td>
+		<td class="label-cell"><inp2:m_phrase label="$title"/>:</td>
 		<td class="control-mid">&nbsp;</td>
 		<td class="control-cell">
 			<input type="hidden" value="" name="<inp2:po_InputName field="Values"/>" id="<inp2:po_InputName field="Values"/>">
@@ -312,7 +340,7 @@
 			<!--<inp2:m_RenderElement name="inp_edit_checkbox" prefix="po" field="Listable" title="la_fld_Listable"/>-->
 			<inp2:m_RenderElement name="inp_edit_options" prefix="po" field="OptionType" has_empty="1" empty_value="0" title="la_fld_OptionType" onchange="update_type(this.value)"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="po" field="Priority" title="la_fld_Priority" size="2"/>
-			<inp2:m_RenderElement name="options_list" prefix="po" field="Values" title="la_fld_Values" size="2"/>
+			<inp2:m_RenderElement name="options_list" prefix="po" field="Values" title="la_fld_OptionValues" size="2"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>