diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index 420e15ac0..71bbe1d08 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -64,9 +64,7 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private Component messagesContainer;
 
-    private Component editWindow;
-
-    private Component createWindow;
+    private Window editWindow;
 
     private Component listWindow;
 
@@ -80,8 +78,7 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private OnlyOneVisible getVisibility() {
         if (cachedOnlyOneVisible == null) {
-            cachedOnlyOneVisible = new OnlyOneVisible(listWindow, editWindow,
-                    createWindow);
+            cachedOnlyOneVisible = new OnlyOneVisible(listWindow, editWindow);
         }
         return cachedOnlyOneVisible;
     }
@@ -195,29 +192,24 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     public void goToEditForm(Order order) {
         orderModel.prepareEditFor(order);
-        clearOrderElementTreeController(editWindow);
-        selectDefaultTab(editWindow);
+        showEditWindow(_("Edit order"));
+    }
+
+    private void showEditWindow(String title) {
+        clearEditWindow();
+        editWindow.setTitle(title);
         getVisibility().showOnly(editWindow);
         Util.reloadBindings(editWindow);
     }
 
-    private void selectDefaultTab(Component comp) {
-        Tab tabGeneralData = (Tab) comp.getFellowIfAny("tabGeneralData");
-        tabGeneralData.setSelected(true);
-    }
-
-    private void clearOrderElementTreeController(Component comp) {
-        OrderElementTreeController controller = (OrderElementTreeController) comp
-                .getVariable("orderElementTreeController", true);
+    private void clearEditWindow() {
+        OrderElementTreeController controller = (OrderElementTreeController) editWindow.getVariable("orderElementTreeController", true);
         controller.clear();
     }
 
     public void goToCreateForm() {
         orderModel.prepareForCreate();
-        clearOrderElementTreeController(createWindow);
-        selectDefaultTab(createWindow);
-        getVisibility().showOnly(createWindow);
-        Util.reloadBindings(createWindow);
+        showEditWindow(_("Create order"));
     }
 
     @Override
@@ -230,11 +222,8 @@ public class OrderCRUDController extends GenericForwardComposer {
         OrderElementController orderElementController = new OrderElementController();
         orderElementController.doAfterCompose(comp
                 .getFellow("editOrderElement"));
-
         setupOrderElementTreeController(comp, "editWindow",
                 orderElementController);
-        setupOrderElementTreeController(comp, "createWindow",
-                orderElementController);
     }
 
     private void setupOrderElementTreeController(Component comp, String window,
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
index 19bc892e2..7a7707f12 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
@@ -49,6 +49,7 @@ import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Intbox;
 import org.zkoss.zul.Label;
 import org.zkoss.zul.RendererCtrl;
+import org.zkoss.zul.Tab;
 import org.zkoss.zul.Textbox;
 import org.zkoss.zul.Tree;
 import org.zkoss.zul.TreeModel;
@@ -726,9 +727,17 @@ public class OrderElementTreeController extends GenericForwardComposer {
      * {@link IPredicate}
      */
     public void clear() {
+        selectDefaultTab();
         cbFilterType.setSelectedIndex(0);
         bdFilter.clear();
         predicate = null;
     }
 
+    Tab tabGeneralData;
+
+    private void selectDefaultTab() {
+        tabGeneralData.setSelected(true);
+    }
+
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index 4756e16d2..b7d56bb16 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -19,7 +19,7 @@
 -->
 
 <?component name="orderElementTree" inline="true" macroURI="_orderElementTree.zul"?>
-<window id="${arg.top_id}" title="${arg.title}">
+<window id="${arg.top_id}">
     <tabbox>
         <tabs>
             <tab id="tabGeneralData" label="${i18n:_('General data')}" />
@@ -76,8 +76,6 @@
         </tabpanels>
     </tabbox>
 
-    <button onClick="controller.save();"
-        label="${arg.save_button_label}" />
-    <button onClick="controller.cancel();"
-        label="${arg.cancel_button_label}" />
+    <button label="${i18n:_('Save')}" onClick="controller.save()" />
+    <button label="${i18n:_('Cancel')}" onClick="controller.cancel()" />
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_list.zul b/navalplanner-webapp/src/main/webapp/orders/_list.zul
index 44a6bbc4f..a2d46843c 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_list.zul
@@ -24,11 +24,15 @@
         <columns>
             <column label="${i18n:_('Name')}" sort="auto(name)" />
             <column label="${i18n:_('Code')}" sort="auto(code)" />
-            <column label="${i18n:_('Starting date')}" sort="auto(initDate)" />
-            <column label="${i18n:_('Ending date')}" sort="auto(endDate)" />
-            <column label="${i18n:_('Responsible')}" sort="auto(responsible)" />
+            <column label="${i18n:_('Starting date')}"
+                sort="auto(initDate)" />
+            <column label="${i18n:_('Ending date')}"
+                sort="auto(endDate)" />
+            <column label="${i18n:_('Responsible')}"
+                sort="auto(responsible)" />
             <column label="${i18n:_('Customer')}" sort="auto(customer)" />
-            <column label="${i18n:_('Description')}" sort="auto(description)" />
+            <column label="${i18n:_('Description')}"
+                sort="auto(description)" />
             <column label="${i18n:_('Operations')}" />
         </columns>
         <rows>
@@ -41,18 +45,21 @@
                 <label value="@{order.customer}" />
                 <label value="@{order.description}" />
                 <hbox>
-                    <button sclass="icono" image="/common/img/ico_editar1.png"
+                    <button sclass="icono"
+                        image="/common/img/ico_editar1.png"
                         hoverImage="/common/img/ico_editar.png"
                         tooltiptext="${i18n:_('Edit')}"
                         onClick="controller.goToEditForm(self.parent.parent.value);">
                     </button>
 
-                    <button sclass="icono" image="/common/img/ico_borrar1.png"
+                    <button sclass="icono"
+                        image="/common/img/ico_borrar1.png"
                         hoverImage="/common/img/ico_borrar.png"
                         tooltiptext="${i18n:_('Delete')}"
                         onClick="controller.confirmRemove(self.parent.parent.value)" />
 
-                    <button sclass="icono" image="/common/img/ico_planificador1.png"
+                    <button sclass="icono"
+                        image="/common/img/ico_planificador1.png"
                         hoverImage="/common/img/ico_planificador.png"
                         tooltiptext="${i18n:_('Schedule')}"
                         onClick="controller.confirmSchedule(self.parent.parent.value);" />
@@ -60,7 +67,6 @@
             </row>
         </rows>
     </grid>
-    <button id="show_create_form" onClick="controller.goToCreateForm();"
-        label="${i18n:_('Create')}">
-    </button>
-</window>
+    <button id="show_create_form" label="${i18n:_('Create')}"
+         onClick="controller.goToCreateForm()" />
+</window>
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul b/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
index b218fc832..7bc6dbac6 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
@@ -27,13 +27,9 @@
 ]]>
 </zscript>
     <window apply="${orderController}">
-        <vbox id="messagesContainer"></vbox>
+        <vbox id="messagesContainer" />
         <list top_id="listWindow" />
-        <edition top_id="createWindow" title="${i18n:_('Create')}"
-            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
-        <edition top_id="editWindow" title="${i18n:_('Edit order')}"
-            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
-        <orderElement top_id="editOrderElement" title="${i18n:_('Edit order element')}"
-            back_button_label="${i18n:_('Back')}" />
+        <edition top_id="editWindow" />
+        <orderElement top_id="editOrderElement" title="${i18n:_('Edit order element')}" />
     </window>
-</zk>
+</zk>
\ No newline at end of file