diff --git a/navalplanner-webapp/src/main/webapp/common/error.zul b/navalplanner-webapp/src/main/webapp/common/error.zul
index f5bac6293..827fafe50 100644
--- a/navalplanner-webapp/src/main/webapp/common/error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/error.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: Error')}" ?>
 <?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/common/layout/login.zul b/navalplanner-webapp/src/main/webapp/common/layout/login.zul
index 506ec1c05..8cbdc0348 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/login.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/login.zul
@@ -17,6 +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: User access')}" ?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/login.css"?>
 
diff --git a/navalplanner-webapp/src/main/webapp/common/page_not_found.zul b/navalplanner-webapp/src/main/webapp/common/page_not_found.zul
index 8609a177a..0b05cc846 100644
--- a/navalplanner-webapp/src/main/webapp/common/page_not_found.zul
+++ b/navalplanner-webapp/src/main/webapp/common/page_not_found.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: Page not found')}" ?>
 <?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/costCategory.zul b/navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul
index ebea31c27..2462797b5 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 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 faf35611d..7c75b3f66 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 id="work_report_admin"?>
+<?page title="${i18n:_('NavalPlan: Type of 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/externalcompanies.zul b/navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul
index fdd60c7f2..8531bd6e9 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 id="work_report_admin"?>
+<?page title="${i18n:_('NavalPlan: External 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/labelTypes.zul b/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul
index d5876c3e1..28f13f1f0 100644
--- a/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul
@@ -17,8 +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  id="labelTypesList"?>
+<?page title="${i18n:_('NavalPlan: Label types')}" 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/materials.zul b/navalplanner-webapp/src/main/webapp/materials/materials.zul
index 3dedf137f..1b44ebcbe 100644
--- a/navalplanner-webapp/src/main/webapp/materials/materials.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/materials.zul
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page  id="labelTypesList"?>
+<?page title="${i18n:_('NavalPlan: Materials')}" 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/reports/hoursWorkedPerWorkerReport.zul b/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul
index baa03f0c9..76d40b05c 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  id="reports"?>
+<?page title="${i18n:_('NavalPlan: Hours worked report')}" id="reports"?>
 <?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/schedulingProgressPerOrderReport.zul b/navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul
index e49556340..711fc3634 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  id="reports"?>
+<?page title="${i18n:_('NavalPlan: Scheduling progress report')}" id="reports"?>
 <?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/timeLineMaterialReport.zul b/navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul
index a56e607a3..6b62d23a7 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  id="reports"?>
+<?page title="${i18n:_('NavalPlan: Timeline material report')}" id="reports"?>
 <?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/workingArrangementsPerOrderReport.zul b/navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul
index 040eb0bff..ed98db175 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  id="reports"?>
+<?page title="${i18n:_('NavalPlan: Working arrangements report')}" id="reports"?>
 <?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/workingProgressPerTaskReport.zul b/navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
index eb77c83ca..28756add1 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  id="reports"?>
+<?page title="${i18n:_('NavalPlan: Working progress report')}" id="reports"?>
 <?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/resources/criterions/criterions-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul
index 7230c53e7..83aff8350 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page  id="criterions_admin"?>
+<?page title="${i18n:_('NavalPlan: Criteria')}" id="criterions_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/resources/machine/machines.zul b/navalplanner-webapp/src/main/webapp/resources/machine/machines.zul
index 7d9b64643..751379e2c 100644
--- a/navalplanner-webapp/src/main/webapp/resources/machine/machines.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/machine/machines.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('Resources')}"?>
+<?page title="${i18n:_('NavalPlan: Machines')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="Create"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul b/navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul
index 726f1bace..9ad0b7235 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:_('Virtual resources')}"?>
+<?page title="${i18n:_('NavalPlan: Virtual workers')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="Create"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
index 5cab492e8..52e3186a2 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:_('Resources')}"?>
+<?page title="${i18n:_('NavalPlan: Resources')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="Create"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
diff --git a/navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul b/navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul
index a2e8e518c..4988db3ab 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:_('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"?>
diff --git a/navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul b/navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
index 744984ee1..5ccb52abf 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:_('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"?>
diff --git a/navalplanner-webapp/src/main/webapp/templates/templates.zul b/navalplanner-webapp/src/main/webapp/templates/templates.zul
index 9d5cf71c1..e441aa865 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:_('Templates')}"?>
+<?page title="${i18n:_('NavalPlan: Templates')}"?>
 <?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/users/profiles.zul b/navalplanner-webapp/src/main/webapp/users/profiles.zul
index a5a32fc27..56a9be4e4 100644
--- a/navalplanner-webapp/src/main/webapp/users/profiles.zul
+++ b/navalplanner-webapp/src/main/webapp/users/profiles.zul
@@ -19,7 +19,7 @@
 -->
 
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?page id="work_report_admin"?>
+<?page title="${i18n:_('NavalPlan: Profiles')}" 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/users/users.zul b/navalplanner-webapp/src/main/webapp/users/users.zul
index 680df5c39..ca7b98703 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 id="work_report_admin"?>
+<?page title="${i18n:_('NavalPlan: User 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/workReport.zul b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
index a8d4234f5..2524b1f16 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 id="work_report_admin"?>
+<?page title="${i18n:_('NavalPlan: Work report')}" 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/workReportQuery.zul b/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
index beccc1677..8c0755d17 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 id="work_report_admin_query"?>
+<?page title="${i18n:_('NavalPlan: Work report admin query')}" 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"?>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
index 66b1179e1..71303e316 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  id="List"?>
+<?page title="${i18n:_('NavalPlan: Work report types')}" 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"?>