diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
index 42b1d24c5..a3a22c4d0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
@@ -221,54 +221,54 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
 
     public void initializeMenu() {
         topItem(_("Scenarios"), "/scenarios/scenarios.zul", "",
-            subItem(_("Scenarios management"), "/scenarios/scenarios.zul",""),
-            subItem(_("Transfer orders between scenarios"), "/scenarios/transferOrders.zul", ""));
+            subItem(_("Scenarios Management"), "/scenarios/scenarios.zul",""),
+            subItem(_("Transfer Projects Between Scenarios"), "/scenarios/transferOrders.zul", ""));
 
         topItem(_("Scheduling"), "/planner/index.zul", "",
-            subItem(_("Projects planning"), "/planner/index.zul;company_scheduling","01-introducion.html"),
-            subItem(_("Resource usage"),"/planner/index.zul;company_load","01-introducion.html#id1"),
+            subItem(_("Projects Planning"), "/planner/index.zul;company_scheduling","01-introducion.html"),
+            subItem(_("Resource Usage"),"/planner/index.zul;company_load","01-introducion.html#id1"),
             subItem(_("Projects"), "/planner/index.zul;orders_list","01-introducion.html#id2"),
-            subItem(_("Limiting resources planning"),"/planner/index.zul;limiting_resources","01-introducion.html"),
-            subItem(_("Project templates"), "/templates/templates.zul", ""));
+            subItem(_("Limiting Resources Planning"),"/planner/index.zul;limiting_resources","01-introducion.html"),
+            subItem(_("Project Templates"), "/templates/templates.zul", ""));
 
         topItem(_("Resources"), "/resources/worker/worker.zul", "",
             subItem(_("Workers"), "/resources/worker/worker.zul","05-recursos.html#xesti-n-de-traballadores"),
             subItem(_("Machines"), "/resources/machine/machines.zul","05-recursos.html#xesti-n-de-m-quinas"),
-            subItem(_("Virtual workers groups"),"/resources/worker/virtualWorkers.zul","05-recursos.html#xesti-n-de-traballadores"),
-            subItem(_("Work reports"), "/workreports/workReport.zul", "09-partes.html#id3"),
+            subItem(_("Virtual Workers Groups"),"/resources/worker/virtualWorkers.zul","05-recursos.html#xesti-n-de-traballadores"),
+            subItem(_("Work Reports"), "/workreports/workReport.zul", "09-partes.html#id3"),
             subItem(_("Companies"), "/externalcompanies/externalcompanies.zul",""),
             subItem(_("Subcontracting"), "/subcontract/subcontractedTasks.zul", "",
-                subItem(_("Subcontracted tasks"), "/subcontract/subcontractedTasks.zul", ""),
-                subItem(_("Advance report"), "/subcontract/reportAdvances.zul", "")));
+                subItem(_("Subcontracted Tasks"), "/subcontract/subcontractedTasks.zul", ""),
+                subItem(_("Advance Report"), "/subcontract/reportAdvances.zul", "")));
 
         if (SecurityUtils.isUserInRole(UserRole.ROLE_ADMINISTRATION)) {
             topItem(_("Administration / Management"), "/advance/advanceTypes.zul", "",
-                subItem(_("NavalPlan configuration"), "/common/configuration.zul","03-calendarios.html#calendario-por-defecto"),
+                subItem(_("NavalPlan Configuration"), "/common/configuration.zul","03-calendarios.html#calendario-por-defecto"),
                 subItem(_("Users"), "/users/users.zul","13-usuarios.html#administraci-n-de-usuarios",
                     subItem(_("Accounts"), "/users/users.zul","13-usuarios.html#administraci-n-de-usuarios"),
                     subItem(_("Profiles"), "/users/profiles.zul","13-usuarios.html#administraci-n-de-perfiles")),
                 subItem(_("Calendars"),"/calendars/calendars.zul", "03-calendarios.html"),
                 subItem(_("Materials"), "/materials/materials.zul", "11-materiales.html#administraci-n-de-materiais"),
-                subItem(_("Quality forms"),"/qualityforms/qualityForms.zul","12-formularios-calidad.html#administraci-n-de-formularios-de-calidade"),
-                subItem(_("Cost categories"),"/costcategories/costCategory.zul","14-custos.html#categor-as-de-custo"),
-                subItem(_("Data types"),"/advance/advanceTypes.zul", "04-avances.html#id1",
+                subItem(_("Quality Forms"),"/qualityforms/qualityForms.zul","12-formularios-calidad.html#administraci-n-de-formularios-de-calidade"),
+                subItem(_("Cost Categories"),"/costcategories/costCategory.zul","14-custos.html#categor-as-de-custo"),
+                subItem(_("Data Types"),"/advance/advanceTypes.zul", "04-avances.html#id1",
                     subItem(_("Advances"),"/advance/advanceTypes.zul", "04-avances.html#id1"),
                     subItem(_("Criteria"),"/resources/criterions/criterions-V2.zul","02-criterios.html#id1"),
                     subItem(_("Labels"), "/labels/labelTypes.zul","10-etiquetas.html"),
                     subItem(_("Units"), "/materials/unitTypes.zul", "11-materiales.html#administraci-n-de-materiais"),
-                    subItem(_("Work hours"),"/costcategories/typeOfWorkHours.zul","14-custos.html#administraci-n-de-horas-traballadas"),
-                    subItem(_("Work reports"),"/workreports/workReportTypes.zul","09-partes.html#id2")));
+                    subItem(_("Work Hours"),"/costcategories/typeOfWorkHours.zul","14-custos.html#administraci-n-de-horas-traballadas"),
+                    subItem(_("Work Reports"),"/workreports/workReportTypes.zul","09-partes.html#id2")));
             }
 
         topItem(_("Reports"), "/reports/hoursWorkedPerWorkerReport.zul", "",
-            subItem(_("Work reports"), "/workreports/workReportQuery.zul", "09-partes.html#id4"),
-            subItem(_("Hours worked per resource"),"/reports/hoursWorkedPerWorkerReport.zul","15-informes.html"),
-            subItem(_("Work and progress per project"),"/reports/schedulingProgressPerOrderReport.zul", "15-informes.html"),
-            subItem(_("Work and progress per task"),"/reports/workingProgressPerTaskReport.zul", "15-informes.html"),
-            subItem(_("Estimated/planned hours per task"),"/reports/completedEstimatedHoursPerTask.zul", "15-informes.html"),
-            subItem(_("Project costs per resource"),"/reports/orderCostsPerResource.zul", "15-informes.html"),
-            subItem(_("Task scheduling status in project"),"/reports/workingArrangementsPerOrderReport.zul","15-informes.html"),
-            subItem(_("Materials needs at date"),"/reports/timeLineMaterialReport.zul","15-informes.html"));
+            subItem(_("Work Reports"), "/workreports/workReportQuery.zul", "09-partes.html#id4"),
+            subItem(_("Hours Worked Per Resource"),"/reports/hoursWorkedPerWorkerReport.zul","15-informes.html"),
+            subItem(_("Work And Progress Per Project"),"/reports/schedulingProgressPerOrderReport.zul", "15-informes.html"),
+            subItem(_("Work And Progress Per Task"),"/reports/workingProgressPerTaskReport.zul", "15-informes.html"),
+            subItem(_("Estimated/Planned Hours Per Task"),"/reports/completedEstimatedHoursPerTask.zul", "15-informes.html"),
+            subItem(_("Project Costs Per Resource"),"/reports/orderCostsPerResource.zul", "15-informes.html"),
+            subItem(_("Task Scheduling Status In Project"),"/reports/workingArrangementsPerOrderReport.zul","15-informes.html"),
+            subItem(_("Materials Needs At Date"),"/reports/timeLineMaterialReport.zul","15-informes.html"));
     }
 
     private Vbox getRegisteredItemsInsertionPoint() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
index 864e1d5d3..870a1e36c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
@@ -29,7 +29,6 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.logging.LogFactory;
-import org.hibernate.validator.InvalidValue;
 import org.joda.time.LocalDate;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
@@ -53,10 +52,10 @@ import org.zkoss.zul.Button;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Decimalbox;
+import org.zkoss.zul.Grid;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Row;
 import org.zkoss.zul.RowRenderer;
-import org.zkoss.zul.Grid;
 import org.zkoss.zul.Rows;
 import org.zkoss.zul.api.Hbox;
 import org.zkoss.zul.api.Window;
@@ -124,6 +123,7 @@ public class CostCategoryCRUDController extends GenericForwardComposer
     @Override
     public void goToCreateForm() {
         costCategoryModel.initCreate();
+        createWindow.setTitle(_("Create Cost Category"));
         getVisibility().showOnly(createWindow);
         Util.reloadBindings(createWindow);
     }
@@ -131,6 +131,7 @@ public class CostCategoryCRUDController extends GenericForwardComposer
     @Override
     public void goToEditForm(CostCategory costCategory) {
         costCategoryModel.initEdit(costCategory);
+        createWindow.setTitle(_("Edit Cost Category"));
         getVisibility().showOnly(createWindow);
         Util.reloadBindings(createWindow);
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java
index 7b494f179..a2a490814 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java
@@ -71,6 +71,7 @@ public class TypeOfWorkHoursCRUDController extends GenericForwardComposer implem
     @Override
     public void goToCreateForm() {
         typeOfWorkHoursModel.initCreate();
+        createWindow.setTitle(_("Create Work Hours Type"));
         getVisibility().showOnly(createWindow);
         Util.reloadBindings(createWindow);
     }
@@ -78,6 +79,7 @@ public class TypeOfWorkHoursCRUDController extends GenericForwardComposer implem
     @Override
     public void goToEditForm(TypeOfWorkHours typeOfWorkHours) {
         typeOfWorkHoursModel.initEdit(typeOfWorkHours);
+        createWindow.setTitle(_("Edit Work Hours Type"));
         getVisibility().showOnly(createWindow);
         Util.reloadBindings(createWindow);
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java
index d8effda31..c78b3610d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java
@@ -81,6 +81,7 @@ public class ExternalCompanyCRUDController extends GenericForwardComposer
     @Override
     public void goToCreateForm() {
         externalCompanyModel.initCreate();
+        createWindow.setTitle(_("Create Company"));
         getVisibility().showOnly(createWindow);
         setInteractionFieldsActivation(getCompany().getInteractsWithApplications());
         clearAutocompleteUser();
@@ -97,6 +98,7 @@ public class ExternalCompanyCRUDController extends GenericForwardComposer
     @Override
     public void goToEditForm(ExternalCompany company) {
         externalCompanyModel.initEdit(company);
+        createWindow.setTitle(_("Edit Company"));
         getVisibility().showOnly(createWindow);
         setInteractionFieldsActivation(company.getInteractsWithApplications());
         clearAutocompleteUser();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
index 175d0837b..aa9d2b0bb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
@@ -134,7 +134,7 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
      */
     public void goToCreateForm() {
         labelTypeModel.initCreate();
-        editWindow.setTitle(_("Create label type"));
+        editWindow.setTitle(_("Create Label Type"));
         showEditWindow();
         Util.reloadBindings(editWindow);
     }
@@ -150,7 +150,7 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
      */
     public void goToEditForm(LabelType labelType) {
         labelTypeModel.initEdit(labelType);
-        editWindow.setTitle(_("Edit label type"));
+        editWindow.setTitle(_("Edit Label Type"));
         showEditWindow();
         Util.reloadBindings(editWindow);
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
index 8fb345df2..cbeb8301c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
@@ -32,7 +32,6 @@ import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.MessagesForUser;
 import org.navalplanner.web.common.OnlyOneVisible;
 import org.navalplanner.web.common.Util;
-import org.zkoss.util.logging.Log;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.CheckEvent;
@@ -46,6 +45,7 @@ import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Row;
 import org.zkoss.zul.RowRenderer;
 import org.zkoss.zul.Textbox;
+import org.zkoss.zul.api.Window;
 import org.zkoss.zul.impl.InputElement;
 
 /**
@@ -65,7 +65,7 @@ public class UnitTypeController extends GenericForwardComposer {
     private OnlyOneVisible visibility;
 
     private Component listWindow;
-    private Component editWindow;
+    private Window editWindow;
 
     private IUnitTypeModel unitTypeModel;
 
@@ -155,12 +155,14 @@ public class UnitTypeController extends GenericForwardComposer {
 
     public void goToEditFormInCreationMode() {
         unitTypeModel.initCreate();
+        editWindow.setTitle(_("Create Unit Type"));
         getVisibility().showOnly(editWindow);
         Util.reloadBindings(editWindow);
     }
 
     private void goToEditFormInEditionMode(UnitType unitType) {
         unitTypeModel.initEdit(unitType);
+        editWindow.setTitle(_("Edit Unit Type"));
         getVisibility().showOnly(editWindow);
         Util.reloadBindings(editWindow);
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java
index a129fe57c..b4f0d39fe 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java
@@ -134,7 +134,7 @@ public class LimitingResourcesTabCreator {
             }
 
         };
-        return new CreatedOnDemandTab(_("Limiting resources"),
+        return new CreatedOnDemandTab(_("Limiting Resources Planning"),
                 "limiting-resources",
                 componentCreator) {
             @Override
@@ -147,7 +147,8 @@ public class LimitingResourcesTabCreator {
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
                 breadcrumbs.appendChild(new Label(PLANNIFICATION));
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
-                breadcrumbs.appendChild(new Label(_("Limiting resources")));
+                breadcrumbs.appendChild(new Label(
+                        _("Limiting Resources Planning")));
             }
         };
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
index f6c0491cf..86da6775a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
@@ -98,7 +98,7 @@ public class OrdersTabCreator {
     }
 
     private ITab createGlobalOrdersTab() {
-        return new CreatedOnDemandTab(_("Orders List"), "orders", ordersTabCreator) {
+        return new CreatedOnDemandTab(_("Projects"), "orders", ordersTabCreator) {
             @Override
             protected void afterShowAction() {
                 orderCRUDController.goToList();
@@ -106,9 +106,9 @@ public class OrdersTabCreator {
                     breadcrumbs.getChildren().clear();
                 }
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
-                breadcrumbs.appendChild(new Label(_("Company Scheduling")));
+                breadcrumbs.appendChild(new Label(_("Scheduling")));
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
-                breadcrumbs.appendChild(new Label(_("Order List")));
+                breadcrumbs.appendChild(new Label(_("Projects")));
             }
         };
     }
@@ -125,7 +125,7 @@ public class OrdersTabCreator {
     }
 
     private ITab createOrderOrdersTab() {
-        return new CreatedOnDemandTab(_("Order Details"), "order-data",
+        return new CreatedOnDemandTab(_("Project Details"), "order-data",
                 ordersTabCreator) {
             @Override
             protected void afterShowAction() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
index 3bd6266ec..e689492d1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
@@ -150,7 +150,8 @@ public class PlanningTabCreator {
             }
 
         };
-        return new CreatedOnDemandTab(_("Company Scheduling"), "company-scheduling",
+        return new CreatedOnDemandTab(_("Projects Planning"),
+                "company-scheduling",
                 componentCreator) {
             @Override
             protected void afterShowAction() {
@@ -159,7 +160,7 @@ public class PlanningTabCreator {
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
                 breadcrumbs.appendChild(new Label(PLANNIFICATION));
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
-                breadcrumbs.appendChild(new Label(_("Company Scheduling")));
+                breadcrumbs.appendChild(new Label(_("Projects Planning")));
             }
         };
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java
index 8f547133f..67bea9f1d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java
@@ -137,7 +137,7 @@ public class ResourcesLoadTabCreator {
             }
 
         };
-        return new CreatedOnDemandTab(_("Overall Resources Load"), "company-load",
+        return new CreatedOnDemandTab(_("Resource Usage"), "company-load",
                 componentCreator) {
             @Override
             protected void afterShowAction() {
@@ -151,7 +151,7 @@ public class ResourcesLoadTabCreator {
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
                 breadcrumbs.appendChild(new Label(PLANNIFICATION));
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
-                breadcrumbs.appendChild(new Label(_("Overall Resources Load")));
+                breadcrumbs.appendChild(new Label(_("Resource Usage")));
             }
         };
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
index 2e95aedd6..26e2ada62 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
@@ -145,7 +145,7 @@ public class QualityFormCRUDController extends GenericForwardComposer {
      */
     public void goToCreateForm() {
         qualityFormModel.initCreate();
-        editWindow.setTitle(_("Create quality form"));
+        editWindow.setTitle(_("Create Quality Form"));
         showEditWindow();
         Util.reloadBindings(editWindow);
     }
@@ -160,7 +160,7 @@ public class QualityFormCRUDController extends GenericForwardComposer {
      */
     public void goToEditForm(QualityForm qualityForm) {
         qualityFormModel.initEdit(qualityForm);
-        editWindow.setTitle(_("Edit quality form"));
+        editWindow.setTitle(_("Edit Quality Form"));
         showEditWindow();
         Util.reloadBindings(editWindow);
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
index 3fd103883..6f9a54690 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
@@ -191,7 +191,7 @@ public class MachineCRUDController extends GenericForwardComposer {
         configurationController.initConfigurationController(machineModel);
         resourcesCostCategoryAssignmentController.setResource(machineModel.getMachine());
         selectMachineDataTab();
-        showEditWindow(_("Create machine"));
+        showEditWindow(_("Create Machine"));
         resourceCalendarModel.cancel();
     }
 
@@ -216,7 +216,7 @@ public class MachineCRUDController extends GenericForwardComposer {
         prepareCriterionsForEdit();
         prepareCalendarForEdit();
         selectMachineDataTab();
-        showEditWindow(_("Edit machine"));
+        showEditWindow(_("Edit Machine"));
         configurationController.initConfigurationController(machineModel);
         resourcesCostCategoryAssignmentController.setResource(machineModel.getMachine());
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
index 0d03d9287..a99b19c61 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
@@ -249,7 +249,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
             editCalendar();
         }
         editAsignedCriterions();
-        editWindow.setTitle(_("Edit virtual worker groups"));
+        editWindow.setTitle(_("Edit Virtual Workers Group"));
         getVisibility().showOnly(editWindow);
         Util.reloadBindings(editWindow);
     }
@@ -500,7 +500,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
         createAsignedCriterions();
         resourcesCostCategoryAssignmentController.setResource(workerModel
                 .getWorker());
-        editWindow.setTitle(_("Create virtual resource"));
+        editWindow.setTitle(_("Create Virtual Workers Group"));
         getVisibility().showOnly(editWindow);
         Util.reloadBindings(editWindow);
         resourceCalendarModel.cancel();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java
index 8c8c1f266..846b5a22a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java
@@ -91,6 +91,7 @@ public class ProfileCRUDController extends GenericForwardComposer implements
     @Override
     public void goToCreateForm() {
         profileModel.initCreate();
+        createWindow.setTitle(_("Create Profile"));
         getVisibility().showOnly(createWindow);
         Util.reloadBindings(createWindow);
     }
@@ -98,6 +99,7 @@ public class ProfileCRUDController extends GenericForwardComposer implements
     @Override
     public void goToEditForm(Profile profile) {
         profileModel.initEdit(profile);
+        createWindow.setTitle(_("Edit Profile"));
         getVisibility().showOnly(createWindow);
         Util.reloadBindings(createWindow);
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java
index ef6ab8241..b033c4122 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java
@@ -113,6 +113,7 @@ public class UserCRUDController extends GenericForwardComposer implements
         //password is compulsory when creating
         passwordBox.setConstraint("no empty:" +
                 _("The password for a new user cannot be empty"));
+        createWindow.setTitle(_("Create User"));
         getVisibility().showOnly(createWindow);
         Util.reloadBindings(createWindow);
         //clean the password boxes, they are not cleared automatically
@@ -127,6 +128,7 @@ public class UserCRUDController extends GenericForwardComposer implements
         //password is not compulsory when editing, so we remove
         //the constraint
         passwordBox.setConstraint((Constraint)null);
+        createWindow.setTitle(_("Edit User"));
         getVisibility().showOnly(createWindow);
         Util.reloadBindings(createWindow);
         //cleans the box and forces the check of the new Constraint (null)
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
index 50c7b1f93..70534bba8 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
@@ -581,6 +581,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
         cameBackList = false;
         workReportModel.initCreate(workReportType);
         prepareWorkReportList();
+        createWindow.setTitle(_("Create Work Report"));
         getVisibility().showOnly(createWindow);
         loadComponents(createWindow);
         Util.reloadBindings(createWindow);
@@ -593,6 +594,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
 
     public void goToEditForm(WorkReport workReport) {
         workReportModel.initEdit(workReport);
+        createWindow.setTitle(_("Edit Work Report"));
         loadComponents(createWindow);
         prepareWorkReportList();
         getVisibility().showOnly(createWindow);
diff --git a/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
index f7c936ae8..a8f4d3793 100644
--- a/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.top_id}" title="${i18n:_('Advance type list')}">
+<window id="${arg.top_id}" title="${i18n:_('Advance Types List')}">
     <newdatasortablegrid id="listing" model="@{controller.advanceTypes}" mold="paging"
         pageSize="10" fixedLayout="true"
         rowRenderer="@{controller.advanceTypeRenderer}" >
diff --git a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
index 825ff2da7..5638934a9 100644
--- a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: AdvanceTypes')}"?>
+<?page title="${i18n:_('NavalPlan: Advances')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="List"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@@ -33,10 +33,10 @@
         apply="org.navalplanner.web.advance.AdvanceTypeCRUDController">
         <vbox id="messagesContainer"></vbox>
         <list top_id="listWindow" />
-        <edition top_id="createWindow" title="${i18n:_('Create new advance type')}"
+        <edition top_id="createWindow" title="${i18n:_('Create Advance Type')}"
             save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}"
             save_and_continue_button_label="${i18n:_('Save &amp; Continue')}" />
-        <edition top_id="editWindow" title="${i18n:_('Edit advance type data')}"
+        <edition top_id="editWindow" title="${i18n:_('Edit Advance Type')}"
             save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}"
             save_and_continue_button_label="${i18n:_('Save &amp; Continue')}" />
     </window>
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul b/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul
index 08ca322e0..2acab5fb4 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul
@@ -20,7 +20,7 @@
 
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
-<window id="${arg.top_id}" title="${i18n:_('Edit cost category')}">
+<window id="${arg.top_id}">
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Category data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul b/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
index 03b56daa7..08ba755e4 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
@@ -20,7 +20,7 @@
 
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
-<window id="${arg.top_id}" title="${i18n:_('Edit type of work hour')}">
+<window id="${arg.top_id}">
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Type data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul b/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
index c1da54dc8..a906c5e5c 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.top_id}" title="${i18n:_('Cost categories listing')}">
+<window id="${arg.top_id}" title="${i18n:_('Cost Categories List')}">
     <newdatasortablegrid id="listing" model="@{controller.costCategories}" mold="paging"
         pageSize="10">
         <columns sizable="true">
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul b/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
index 607f8571a..4eea44f39 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.top_id}" title="${i18n:_('Type of work hours listing')}">
+<window id="${arg.top_id}" title="${i18n:_('Work Hours Types List')}">
     <newdatasortablegrid id="listing" model="@{controller.typesOfWorkHours}" mold="paging"
         pageSize="10" fixedLayout="true">
         <columns sizable="true">
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul b/navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul
index 23f80e39d..074a1086b 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page title="${i18n:_('NavalPlan: Cost categories')}" id="work_report_admin"?>
+<?page title="${i18n:_('NavalPlan: Cost Categories')}" id="work_report_admin"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul b/navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul
index 39f4b17e4..226195ea7 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page title="${i18n:_('NavalPlan: Type of work hours')}" id="work_report_admin"?>
+<?page title="${i18n:_('NavalPlan: Work Hours')}" id="work_report_admin"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul b/navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul
index 1dee59b4d..34a1c3bcc 100644
--- a/navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul
+++ b/navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul
@@ -20,7 +20,7 @@
 
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
-<window id="${arg.top_id}" title="${i18n:_('Edit external company')}">
+<window id="${arg.top_id}">
 
     <tabbox>
         <tabs>
diff --git a/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul b/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
index bb803b15d..af3ad1982 100644
--- a/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
+++ b/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.top_id}" title="${i18n:_('External companies listing')}">
+<window id="${arg.top_id}" title="${i18n:_('Companies List')}">
     <newdatasortablegrid id="listing" model="@{controller.companies}" mold="paging"
         pageSize="10">
         <columns sizable="true">
diff --git a/navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul b/navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul
index 0625d0bf8..653cd6175 100644
--- a/navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul
+++ b/navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page title="${i18n:_('NavalPlan: External companies')}" id="work_report_admin"?>
+<?page title="${i18n:_('NavalPlan: Companies')}" id="work_report_admin"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
index 8555bfa69..b433cf552 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.id}" title="${arg.title}" visible="false">
+<window id="${arg.id}" visible="false">
     <!--  Messages for user -->
     <vbox id="messagesContainer"/>
 
diff --git a/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul b/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
index 23aff966f..ccba7af5d 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.id}" title="${i18n:_('List label types')}">
+<window id="${arg.id}" title="${i18n:_('Label Types List')}">
     <newdatasortablegrid id="labelTypes" model="@{controller.labelTypes}"
         mold="paging" pageSize="10" fixedLayout="true">
         <columns>
diff --git a/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul b/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul
index 2f09d5876..baf5f196d 100644
--- a/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul
@@ -17,7 +17,7 @@
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<?page title="${i18n:_('NavalPlan: Label types')}" id="labelTypesList"?>
+<?page title="${i18n:_('NavalPlan: Labels')}" id="labelTypesList"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
diff --git a/navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul b/navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul
index b1e5387a1..59d902417 100644
--- a/navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul
@@ -17,7 +17,7 @@
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>
  -->
-<window id="${arg.top_id}" title="${arg.title}">
+<window id="${arg.top_id}">
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Edit')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul b/navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul
index bb585df36..402cf48fb 100644
--- a/navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.top_id}" title="${i18n:_('Unit type list')}">
+<window id="${arg.top_id}" title="${i18n:_('Unit Types List')}">
     <newdatasortablegrid id="listing" model="@{controller.unitTypes}" mold="paging"
         pageSize="10" fixedLayout="true"
         rowRenderer="@{controller.unitTypeRenderer}" >
diff --git a/navalplanner-webapp/src/main/webapp/materials/materials.zul b/navalplanner-webapp/src/main/webapp/materials/materials.zul
index 9a74a0650..73c0c9844 100644
--- a/navalplanner-webapp/src/main/webapp/materials/materials.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/materials.zul
@@ -29,94 +29,87 @@
 
 <zk>
     <window self="@{define(content)}"
-        apply="org.navalplanner.web.materials.MaterialsController">
+        apply="org.navalplanner.web.materials.MaterialsController"
+        title="${i18n:_('Materials')}">
         <vbox id="messagesContainer" />
-        <tabbox>
-            <tabs>
-                <tab label="${i18n:_('Materials')}"></tab>
-            </tabs>
-            <tabpanels>
-                <tabpanel>
-                        <!-- Categories  -->
-                        <hbox>
-                            <panel title="${i18n:_('Categories')}"
-                                border="normal">
-                                <panelchildren>
-                                    <hbox>
-                                        <textbox id="txtCategory" onOK="materialsController.addMaterialCategory()"
-                                            style="padding-bottom: 4px" />
-                                        <button label="${i18n:_('Add')}"
-                                            onClick="materialsController.addMaterialCategory()" />
-                                        <separator spacing="20px" orient="vertical" />
-                                        <button label="${i18n:_('Unselect')}" onClick="materialsController.clearSelectionCategoriesTree()" />
-                                    </hbox>
 
-                                    <separator spacing="5px" orient="horizontal" />
+        <!-- Categories  -->
+        <hbox>
+            <panel title="${i18n:_('Categories')}"
+                border="normal">
+                <panelchildren>
+                    <hbox>
+                        <textbox id="txtCategory" onOK="materialsController.addMaterialCategory()"
+                            style="padding-bottom: 4px" />
+                        <button label="${i18n:_('Add')}"
+                            onClick="materialsController.addMaterialCategory()" />
+                        <separator spacing="20px" orient="vertical" />
+                        <button label="${i18n:_('Unselect')}" onClick="materialsController.clearSelectionCategoriesTree()" />
+                    </hbox>
 
-                                    <tree id="categoriesTree" zclass="z-dottree"
-                                        rows="5" vflex="true" multiple="false"
-                                        model="@{materialsController.materialCategories}"
-                                        treeitemRenderer="@{materialsController.materialCategoryRenderer}"
-                                        onSelect="materialsController.refreshMaterials()">
-                                        <treecols>
-                                            <treecol label="${i18n:_('Name')}" />
-                                            <treecol label="${i18n:_('Code')}" />
-                                            <treecol label="${i18n:_('Generate code')}" width="100px" />
-                                            <treecol label="${i18n:_('Operations')}" width="80px" />
-                                        </treecols>
-                                    </tree>
-                                </panelchildren>
-                            </panel>
-                        </hbox>
+                    <separator spacing="5px" orient="horizontal" />
 
-                        <!-- Materials -->
-                        <hbox>
-                            <panel title="${i18n:_('List of materials for all categories (select one to filter)')}"
-                                id="materialsPanel" border="normal">
-                                <panelchildren>
-                                    <button id="btnAddMaterial"
-                                        label="${i18n:_('Add')}"
-                                        onClick="materialsController.addMaterialToMaterialCategory(categoriesTree.selectedItem)" />
-                                    <separator spacing="15px" orient="horizontal" />
-                                    <newdatasortablegrid id="gridMaterials"
-                                        fixedLayout="true" mold="paging" pageSize="5"
-                                        model="@{materialsController.materials}">
-                                        <columns>
-                                            <newdatasortablecolumn label="${i18n:_('Code')}" />
-                                            <newdatasortablecolumn label="${i18n:_('Description')}" />
-                                            <newdatasortablecolumn label="${i18n:_('Unit price')}" />
-                                            <newdatasortablecolumn label="${i18n:_('Unit type')}" />
-                                            <newdatasortablecolumn label="${i18n:_('Category')}" />
-                                            <newdatasortablecolumn label="${i18n:_('Disabled')}" width="80px" />
-                                            <newdatasortablecolumn label="${i18n:_('Operations')}" width="80px" />
-                                        </columns>
-                                        <rows>
-                                            <row self="@{each='material'}" value="@{material}" >
-                                                <textbox id="code" value="@{material.code}" width="95%"
-                                                    constraint="no empty:${i18n:_('cannot be null or empty')}" />
-                                                <textbox value="@{material.description}" width="95%" />
-                                                <doublebox value="@{material.defaultUnitPrice}" />
-                                                <listbox mold="select"  model="@{materialsController.unitTypes}"
-                                                    onSelect = "materialsController.selectUnitType(self)"
-                                                    itemRenderer="@{materialsController.renderer}"/>
-                                                <label value="@{material.category.name}" />
-                                                <checkbox checked="@{material.disabled}" />
-                                                <button sclass="icono"
-                                                    image="/common/img/ico_borrar1.png"
-                                                    hoverImage="/common/img/ico_borrar.png"
-                                                    tooltiptext="${i18n:_('Delete')}"
-                                                    onClick="materialsController.remove(self.parent.value)">
-                                                </button>
-                                            </row>
-                                        </rows>
-                                    </newdatasortablegrid>
+                    <tree id="categoriesTree" zclass="z-dottree"
+                        rows="5" vflex="true" multiple="false"
+                        model="@{materialsController.materialCategories}"
+                        treeitemRenderer="@{materialsController.materialCategoryRenderer}"
+                        onSelect="materialsController.refreshMaterials()">
+                        <treecols>
+                            <treecol label="${i18n:_('Name')}" />
+                            <treecol label="${i18n:_('Code')}" />
+                            <treecol label="${i18n:_('Generate code')}" width="100px" />
+                            <treecol label="${i18n:_('Operations')}" width="80px" />
+                        </treecols>
+                    </tree>
+                </panelchildren>
+            </panel>
+        </hbox>
 
-                                </panelchildren>
-                            </panel>
-                        </hbox>
-                </tabpanel>
-            </tabpanels>
-        </tabbox>
+        <!-- Materials -->
+        <hbox>
+            <panel title="${i18n:_('List of materials for all categories (select one to filter)')}"
+                id="materialsPanel" border="normal">
+                <panelchildren>
+                    <button id="btnAddMaterial"
+                        label="${i18n:_('Add')}"
+                        onClick="materialsController.addMaterialToMaterialCategory(categoriesTree.selectedItem)" />
+                    <separator spacing="15px" orient="horizontal" />
+                    <newdatasortablegrid id="gridMaterials"
+                        fixedLayout="true" mold="paging" pageSize="5"
+                        model="@{materialsController.materials}">
+                        <columns>
+                            <newdatasortablecolumn label="${i18n:_('Code')}" />
+                            <newdatasortablecolumn label="${i18n:_('Description')}" />
+                            <newdatasortablecolumn label="${i18n:_('Unit price')}" />
+                            <newdatasortablecolumn label="${i18n:_('Unit type')}" />
+                            <newdatasortablecolumn label="${i18n:_('Category')}" />
+                            <newdatasortablecolumn label="${i18n:_('Disabled')}" width="80px" />
+                            <newdatasortablecolumn label="${i18n:_('Operations')}" width="80px" />
+                        </columns>
+                        <rows>
+                            <row self="@{each='material'}" value="@{material}" >
+                                <textbox id="code" value="@{material.code}" width="95%"
+                                    constraint="no empty:${i18n:_('cannot be null or empty')}" />
+                                <textbox value="@{material.description}" width="95%" />
+                                <doublebox value="@{material.defaultUnitPrice}" />
+                                <listbox mold="select"  model="@{materialsController.unitTypes}"
+                                    onSelect = "materialsController.selectUnitType(self)"
+                                    itemRenderer="@{materialsController.renderer}"/>
+                                <label value="@{material.category.name}" />
+                                <checkbox checked="@{material.disabled}" />
+                                <button sclass="icono"
+                                    image="/common/img/ico_borrar1.png"
+                                    hoverImage="/common/img/ico_borrar.png"
+                                    tooltiptext="${i18n:_('Delete')}"
+                                    onClick="materialsController.remove(self.parent.value)">
+                                </button>
+                            </row>
+                        </rows>
+                    </newdatasortablegrid>
+
+                </panelchildren>
+            </panel>
+        </hbox>
 
         <!-- Save button -->
         <button onClick="materialsController.saveAndContinue()"
diff --git a/navalplanner-webapp/src/main/webapp/materials/unitTypes.zul b/navalplanner-webapp/src/main/webapp/materials/unitTypes.zul
index d6a6826df..42279b7e7 100644
--- a/navalplanner-webapp/src/main/webapp/materials/unitTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/unitTypes.zul
@@ -17,7 +17,7 @@
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<?page title="${i18n:_('NavalPlan: Unit types')}" id="unitTypes"?>
+<?page title="${i18n:_('NavalPlan: Units')}" id="unitTypes"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
@@ -35,7 +35,6 @@
         <vbox id="messagesContainer"/>
         <list top_id="listWindow"/>
         <edition top_id="editWindow"
-            title="${i18n:_('Edit unit type data')}"
             save_button_label="${i18n:_('Save')}"
             save_and_continue_button_label="${i18n:_('Save &amp; Continue')}"
             cancel_button_label="${i18n:_('Cancel')}"
diff --git a/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul b/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul
index 4d0fb6f03..c119dc89b 100644
--- a/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul
+++ b/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.id}" title="${arg.title}" visible="false">
+<window id="${arg.id}" visible="false">
     <!--  Messages for user -->
     <vbox id="messagesContainer"/>
 
diff --git a/navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul b/navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
index d4cd02f58..622082e5f 100644
--- a/navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
+++ b/navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.id}" title="${i18n:_('List quality forms')}">
+<window id="${arg.id}" title="${i18n:_('Quality Forms List')}">
     <separator bar="false" spacing="20px" orient="vertical"/>
     <div align="right">
         <hbox align="end">
diff --git a/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul b/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul
index ab2e5dd84..9b68e841d 100644
--- a/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul
+++ b/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page id="qualityFormsList" title="${i18n:_('NavalPlan: QualityForms')}"?>
+<?page id="qualityFormsList" title="${i18n:_('NavalPlan: Quality Forms')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
diff --git a/navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul b/navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
index a11f559bc..707429325 100644
--- a/navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
+++ b/navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page  id="reports"?>
+<?page  id="reports" title="${i18n:_('NavalPlan: Estimated/Planned Hours Per Task')}" ?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
@@ -38,7 +38,7 @@
 
     <window self="@{define(content)}"
         apply="org.navalplanner.web.reports.CompletedEstimatedHoursPerTaskController"
-        title="${i18n:_('Completed estimated hours per task')}"
+        title="${i18n:_('Estimated/Planned Hours Per Task')}"
         border="normal" >
 
          <!-- Select deadline date -->
diff --git a/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul b/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul
index f1e6657a8..d73dcc6b3 100644
--- a/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul
+++ b/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: Hours worked report')}" id="reports"?>
+<?page title="${i18n:_('NavalPlan: Hours Worked Per Resource')}" id="reports"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
@@ -46,7 +46,7 @@
 
     <window self="@{define(content)}"
         apply="org.navalplanner.web.reports.HoursWorkedPerWorkerController"
-        title="${i18n:_('Hours worked per worker')}"
+        title="${i18n:_('Hours Worked Per Resource')}"
         border="normal" >
 
          <!-- Select dates -->
diff --git a/navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul b/navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul
index 93bc42905..9afea8ccc 100644
--- a/navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul
+++ b/navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page id="reports"?>
+<?page id="reports" title="${i18n:_('NavalPlan: Project Costs Per Resource')}" ?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
@@ -38,7 +38,7 @@
 
     <window self="@{define(content)}"
         apply="org.navalplanner.web.reports.OrderCostsPerResourceController"
-        title="${i18n:_('Order costs per resource')}">
+        title="${i18n:_('Project Costs Per Resource')}">
 
     <tabbox>
         <tabs>
diff --git a/navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul b/navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul
index 215ef1a1b..b6f8779db 100644
--- a/navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul
+++ b/navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: Scheduling progress report')}" id="reports"?>
+<?page title="${i18n:_('NavalPlan: Work And Progress Per Project')}" id="reports"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
@@ -38,7 +38,7 @@
 
     <window self="@{define(content)}"
         apply="org.navalplanner.web.reports.SchedulingProgressPerOrderController"
-        title="${i18n:_('Scheduling progress per order')}"
+        title="${i18n:_('Work And Progress Per Project')}"
         border="normal" >
 
         <!-- Select dates -->
diff --git a/navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul b/navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul
index efa3ce9ea..05d6eaebe 100644
--- a/navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul
+++ b/navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: Timeline material report')}" id="reports"?>
+<?page title="${i18n:_('NavalPlan: Materials Needs At Date')}" id="reports"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
@@ -38,7 +38,7 @@
 
     <window self="@{define(content)}"
         apply="org.navalplanner.web.reports.TimeLineRequiredMaterialController"
-        title="${i18n:_('Materials needs at date')}"
+        title="${i18n:_('Materials Needs At Date')}"
         border="normal" >
 
 <hbox>
diff --git a/navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul b/navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul
index 128647d9b..fbcc59368 100644
--- a/navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul
+++ b/navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: Task scheduling status report')}" id="reports"?>
+<?page title="${i18n:_('NavalPlan: Task Scheduling Status In Project')}" id="reports"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
@@ -38,7 +38,7 @@
 
     <window self="@{define(content)}"
         apply="org.navalplanner.web.reports.WorkingArrangementsPerOrderController"
-        title="${i18n:_('Task scheduling status for an order')}"
+        title="${i18n:_('Task Scheduling Status In Project')}"
         border="normal" >
 
         <!-- Select orders -->
diff --git a/navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul b/navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
index 462c8f36e..c83088178 100644
--- a/navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
+++ b/navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: Working progress report')}" id="reports"?>
+<?page title="${i18n:_('NavalPlan: Work And Progress Per Task')}" id="reports"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
@@ -38,7 +38,7 @@
 
     <window self="@{define(content)}"
         apply="org.navalplanner.web.reports.WorkingProgressPerTaskController"
-        title="${i18n:_('Working progress per task')}"
+        title="${i18n:_('Work And Progress Per Task')}"
         border="normal" >
 
          <!-- Select deadline date -->
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul
index cd43486eb..26adabfbc 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="listing" title="${i18n:_('Criterion type list')}">
+<window id="listing" title="${i18n:_('Criterion Type List')}">
 <newdatasortablegrid model="@{controller.criterionTypes}" fixedLayout="true">
    <columns>
         <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(name)"/>
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul
index efcbd80f1..c1e5c54d4 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul
@@ -32,9 +32,9 @@
   apply="org.navalplanner.web.resources.criterion.CriterionAdminController_V2">
   <vbox id="messagesContainer"></vbox>
   <list top_id="listWindow" />
-  <edition top_id="createComponent" title="${i18n:_('Create')}"
+  <edition top_id="createComponent" title="${i18n:_('Create Criterion Type')}"
    save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
-  <edition top_id="editComponent" title="${i18n:_('Edit')}"
+  <edition top_id="editComponent" title="${i18n:_('Edit Criterion Type')}"
    save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
   <window visible="@{controller.confirmingRemove}"
             id="confirmRemove" title="${i18n:_('Confirm')}" sizable="true"
diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
index df49962fb..61775858a 100644
--- a/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <?component name="filter" inline="true" macroURI="../search/_resourceFilter.zul"?>
-<window id="listWindow" title="${i18n:_('Machines list')}">
+<window id="listWindow" title="${i18n:_('Machines List')}">
     <separator bar="false" spacing="5px" orient="horizontal"/>
 
     <div align="right">
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
index ca56fceb7..37914f0be 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <?component name="filter" inline="true" macroURI="../search/_resourceFilter.zul"?>
-<window id="${arg.top_id}" title="${i18n:_('Workers list')}">
+<window id="${arg.top_id}" title="${i18n:_('Workers List')}">
     <separator bar="false" spacing="5px" orient="horizontal"/>
 
     <div align="right">
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul
index 7d42d524f..aec1e0119 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <?component name="filter" inline="true" macroURI="../search/_resourceFilter.zul"?>
-<window id="${arg.top_id}" title="${i18n:_('Virtual workers list')}">
+<window id="${arg.top_id}" title="${i18n:_('Virtual Workers Groups List')}">
      <separator bar="false" spacing="5px" orient="horizontal"/>
 
     <div align="right">
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul b/navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul
index c6c22f9a4..f58bb15c2 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: Virtual workers')}"?>
+<?page title="${i18n:_('NavalPlan: Virtual Workers Groups')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="Create"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@@ -35,7 +35,7 @@
 
         <list top_id="listWindow" />
 
-        <edition top_id="editWindow" title="${i18n:_('Edit virtual resource')}"
+        <edition top_id="editWindow"
             save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
 
     </window>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
index c46fad90f..0ea5380c7 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: Resources')}"?>
+<?page title="${i18n:_('NavalPlan: Workers')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="Create"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@@ -36,7 +36,7 @@
 
         <list top_id="listWindow" />
 
-        <edition top_id="editWindow" title="${i18n:_('Edit worker')}"
+        <edition top_id="editWindow" title="${i18n:_('Edit Worker')}"
             save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
 
     </window>
diff --git a/navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul b/navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul
index 5daaf0816..ebef28fab 100644
--- a/navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul
+++ b/navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page id="work_report_admin"?>
+<?page id="work_report_admin" title="${i18n:_('NavalPlan: Scenarios Management')}" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul b/navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul
index f72c0b05c..b6da0ba4b 100644
--- a/navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul
+++ b/navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page id="work_report_admin"?>
+<?page id="work_report_admin" title="${i18n:_('NavalPlan: Transfer Projects Between Scenarios')}" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@@ -28,7 +28,7 @@
 <zk>
 
 <window self="@{define(content)}" id="transferOrdersWindow"
-    title="${i18n:_('Transfer orders between scenarios')}"
+    title="${i18n:_('Transfer Projects Between Scenarios')}"
     apply="org.navalplanner.web.scenarios.TransferOrdersController">
 
     <vbox id="messagesContainer"></vbox>
diff --git a/navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul b/navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul
index c51855f84..1b317bc08 100644
--- a/navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul
+++ b/navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: Subcontracted tasks')}"?>
+<?page title="${i18n:_('NavalPlan: Advance Report')}"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@@ -30,7 +30,7 @@
 <div self="@{define(content)}">
 
 <window apply="${reportAdvancesController}"
-    title="${i18n:_('Report advances')}">
+    title="${i18n:_('Advance Report')}">
 
     <vbox id="messagesContainer" />
 
diff --git a/navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul b/navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
index cfe146bc0..21b578caf 100644
--- a/navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
+++ b/navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: Subcontracted tasks')}"?>
+<?page title="${i18n:_('NavalPlan: Subcontracted Tasks')}"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@@ -30,7 +30,7 @@
 <div self="@{define(content)}">
 
 <window apply="${subcontractedTasksController}"
-    title="${i18n:_('Subcontracted tasks list')}">
+    title="${i18n:_('Subcontracted Tasks List')}">
 
     <vbox id="messagesContainer" />
 
diff --git a/navalplanner-webapp/src/main/webapp/templates/_list.zul b/navalplanner-webapp/src/main/webapp/templates/_list.zul
index bf675501d..33ea99ea5 100644
--- a/navalplanner-webapp/src/main/webapp/templates/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/templates/_list.zul
@@ -17,7 +17,7 @@
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<window id="${arg.top_id}" title="${i18n:_('Templates list')}">
+<window id="${arg.top_id}" title="${i18n:_('Templates List')}">
     <grid id="listing" model="@{templatesForOrdersController.templates}" mold="paging"
         pageSize="10" fixedLayout="true">
         <columns>
diff --git a/navalplanner-webapp/src/main/webapp/templates/templates.zul b/navalplanner-webapp/src/main/webapp/templates/templates.zul
index 705a9805e..186068e9f 100644
--- a/navalplanner-webapp/src/main/webapp/templates/templates.zul
+++ b/navalplanner-webapp/src/main/webapp/templates/templates.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('NavalPlan: Templates')}"?>
+<?page title="${i18n:_('NavalPlan: Scheduling')}"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@@ -50,7 +50,7 @@
     <div self="@{define(content)}" apply="${templatesForOrdersController}">
         <vbox id="messagesContainer" />
         <list top_id="listWindow" />
-        <window id="editWindow" title="${i18n:_('Edit template')}">
+        <window id="editWindow" title="${i18n:_('Edit Template')}">
             <editTemplateWindow />
             <tabbox>
                 <tabs>
diff --git a/navalplanner-webapp/src/main/webapp/users/_editProfile.zul b/navalplanner-webapp/src/main/webapp/users/_editProfile.zul
index aa7a2f577..a37d7bdc4 100644
--- a/navalplanner-webapp/src/main/webapp/users/_editProfile.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_editProfile.zul
@@ -20,7 +20,7 @@
 
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
-<window id="${arg.top_id}" title="${i18n:_('Edit profile')}">
+<window id="${arg.top_id}">
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Profile data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/users/_editUser.zul b/navalplanner-webapp/src/main/webapp/users/_editUser.zul
index 6ec44bb77..a218a2f00 100644
--- a/navalplanner-webapp/src/main/webapp/users/_editUser.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_editUser.zul
@@ -20,7 +20,7 @@
 
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
-<window id="${arg.top_id}" title="${i18n:_('Edit User')}">
+<window id="${arg.top_id}">
     <tabbox>
         <tabs>
             <tab label="${i18n:_('User data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/users/_listProfiles.zul b/navalplanner-webapp/src/main/webapp/users/_listProfiles.zul
index c676895ae..e4045abff 100644
--- a/navalplanner-webapp/src/main/webapp/users/_listProfiles.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_listProfiles.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.top_id}" title="${i18n:_('Profiles listing')}">
+<window id="${arg.top_id}" title="${i18n:_('Profiles List')}">
     <newdatasortablegrid id="listing" model="@{controller.profiles}" mold="paging"
         pageSize="10">
         <columns sizable="true">
diff --git a/navalplanner-webapp/src/main/webapp/users/_listUsers.zul b/navalplanner-webapp/src/main/webapp/users/_listUsers.zul
index 06fa4815a..945fac199 100644
--- a/navalplanner-webapp/src/main/webapp/users/_listUsers.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_listUsers.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.top_id}" title="${i18n:_('Users listing')}">
+<window id="${arg.top_id}" title="${i18n:_('Users List')}">
     <newdatasortablegrid id="listing" model="@{controller.users}" mold="paging"
         pageSize="10">
         <columns sizable="true">
diff --git a/navalplanner-webapp/src/main/webapp/users/users.zul b/navalplanner-webapp/src/main/webapp/users/users.zul
index 1a991aead..fd569a962 100644
--- a/navalplanner-webapp/src/main/webapp/users/users.zul
+++ b/navalplanner-webapp/src/main/webapp/users/users.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page title="${i18n:_('NavalPlan: User accounts')}" id="work_report_admin"?>
+<?page title="${i18n:_('NavalPlan: Accounts')}" id="work_report_admin"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
index 64a16fce6..e8115a544 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<window id="${arg.top_id}" title="${i18n:_('Work Report types')}">
+<window id="${arg.top_id}" title="${i18n:_('Work Report Types')}">
     <grid id="listing" mold="paging" pageSize="10"
         model="@{controller.workReportTypes}"
         onInitRender ="controller.sortWorkReportTypes();">
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
index 297145233..2ff3da962 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page title="${i18n:_('NavalPlan: Work report')}" id="work_report_admin"?>
+<?page title="${i18n:_('NavalPlan: Work Reports')}" id="work_report_admin"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@@ -32,7 +32,7 @@
         apply="org.navalplanner.web.workreports.WorkReportCRUDController">
         <vbox id="messagesContainer"></vbox>
 
-        <window id="listWindow" title="${i18n:_('Work report listing')}">
+        <window id="listWindow" title="${i18n:_('Work Reports List')}">
                 <div align="right">
                 <hbox id="hboxFilter" align="center">
                   <!-- Filter by type, start date and finish date -->
@@ -104,7 +104,7 @@
                 </div>
         </window>
 
-        <window id="createWindow" title="${i18n:_('Edit work report')}">
+        <window id="createWindow">
             <tabbox>
                 <tabs>
                     <tab label="${i18n:_('Report data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul b/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
index e787d5f64..e6ece5fc5 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page title="${i18n:_('NavalPlan: Work report admin query')}" id="work_report_admin_query"?>
+<?page title="${i18n:_('NavalPlan: Work Reports')}" id="work_report_admin_query"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@@ -30,7 +30,7 @@
         apply="org.navalplanner.web.workreports.WorkReportCRUDController">
         <vbox id="messagesContainer"></vbox>
 
-    <window id="listQueryWindow" title="${i18n:_('Work report lines listing')}">
+    <window id="listQueryWindow" title="${i18n:_('Work Report Lines List')}">
        <panel title="${i18n:_('Filter work report by :')}" border="normal"
                     style="overflow:auto">
         <panelchildren>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
index 9f429f88f..846d7e9a8 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page title="${i18n:_('NavalPlan: Work report types')}" id="List"?>
+<?page title="${i18n:_('NavalPlan: Work Reports')}" id="List"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
@@ -32,11 +32,11 @@
         apply="org.navalplanner.web.workreports.WorkReportTypeCRUDController">
         <vbox id="messagesContainer"></vbox>
         <list top_id="listWindow" />
-        <edition top_id="createWindow" title="${i18n:_('Create new Work Report Type')}"
+        <edition top_id="createWindow" title="${i18n:_('Create Work Report Type')}"
             save_button_label="${i18n:_('Save')}"
             saveAndContinue_button_label="${i18n:_('Save &amp; Continue')}"
             cancel_button_label="${i18n:_('Cancel')}" />
-        <edition top_id="editWindow" title="${i18n:_('Edit')}"
+        <edition top_id="editWindow" title="${i18n:_('Edit Work Report Type')}"
             save_button_label="${i18n:_('Save')}"
             saveAndContinue_button_label="${i18n:_('Save &amp; Continue')}"
             cancel_button_label="${i18n:_('Cancel')}" />