diff --git a/src/main/resources/templates/about.ftl b/src/main/resources/templates/about.ftl
index 01076cdc83f7f75240d590207c98669b3fc4d1b1..1d05e0333ea9376633d7db53b4de9e8c94dbe60c 100644
--- a/src/main/resources/templates/about.ftl
+++ b/src/main/resources/templates/about.ftl
@@ -2,7 +2,7 @@
<head>
<#import "helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.about')}"/>
</head>
<body class="budgetmaster-blue-light">
<#import "helpers/navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl
index 92008fa2e046fad7de786578c7af716d4c5d9dbf..5252e000694ac88b2d6f21c58c8f6f0c8a994a33 100644
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.accounts')}"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/src/main/resources/templates/accounts/newAccount.ftl
index d2bcee51564cce2c28288f2582a6f3ad5b002cf4..984a8475f7b85ecf24cf813d6d47b820a33860eb 100644
--- a/src/main/resources/templates/accounts/newAccount.ftl
+++ b/src/main/resources/templates/accounts/newAccount.ftl
@@ -2,7 +2,14 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+
+ <#if account.getID()??>
+ <#assign title=locale.getString("title.account.edit")/>
+ <#else>
+ <#assign title=locale.getString("title.account.new")/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
@@ -13,7 +20,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="headline"><#if account.getID()??>${locale.getString("title.account.edit")}<#else>${locale.getString("title.account.new")}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl
index 0ed165bfd000ddfdbce664a5ad34f91605d151d3..26a1d89e4fc66aedd45ac46a12a99a14ee15858f 100644
--- a/src/main/resources/templates/categories/categories.ftl
+++ b/src/main/resources/templates/categories/categories.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.categories')}"/>
<@header.style "categories"/>
<#import "/spring.ftl" as s>
</head>
diff --git a/src/main/resources/templates/categories/newCategory.ftl b/src/main/resources/templates/categories/newCategory.ftl
index 62f5ff912a1465cb82e8d7cf187c0a6457721af1..259360272278926fb9fdc6dca0876538833d6b47 100644
--- a/src/main/resources/templates/categories/newCategory.ftl
+++ b/src/main/resources/templates/categories/newCategory.ftl
@@ -4,7 +4,14 @@
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+
+ <#if category.getID()??>
+ <#assign title=locale.getString("title.category.edit")/>
+ <#else>
+ <#assign title=locale.getString("title.category.new")/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<link type="text/css" rel="stylesheet" href="<@s.url '${"/css/libs/spectrum.css"}'/>"/>
<@header.style "categories"/>
</head>
@@ -18,7 +25,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="headline"><#if category.getID()??>${locale.getString("title.category.edit")}<#else>${locale.getString("title.category.new")}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl
index 482183b9983970076256bd30d249cedbee00013a..f18bea20d9e8f6b21dd2eb784505d086d9f6ac00 100644
--- a/src/main/resources/templates/charts/charts.ftl
+++ b/src/main/resources/templates/charts/charts.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.charts')}"/>
<@header.style "datepicker"/>
<@header.style "collapsible"/>
<@header.style "charts"/>
diff --git a/src/main/resources/templates/charts/manage.ftl b/src/main/resources/templates/charts/manage.ftl
index dfa374710f245c92f7ec809f773853e3bd250b68..a6add3c532aa18e9e75973c08090221b0bd00fe5 100644
--- a/src/main/resources/templates/charts/manage.ftl
+++ b/src/main/resources/templates/charts/manage.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.charts')}"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/charts/newChart.ftl b/src/main/resources/templates/charts/newChart.ftl
index 1972977c071d2c68cbb94c5729e80ca34bc66aa1..b284ffb2b425d3c0eac3897fd900faa6c0da44ca 100644
--- a/src/main/resources/templates/charts/newChart.ftl
+++ b/src/main/resources/templates/charts/newChart.ftl
@@ -2,7 +2,14 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+
+ <#if chart.getID()??>
+ <#assign title=locale.getString("title.chart.edit")/>
+ <#else>
+ <#assign title=locale.getString("title.chart.new")/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<#import "/spring.ftl" as s>
<link rel="stylesheet" href="<@s.url "/webjars/codemirror/5.50.0/lib/codemirror.css"/>">
<@header.style "charts"/>
@@ -17,7 +24,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="headline"><#if chart.getID()??>${locale.getString("title.chart.edit")}<#else>${locale.getString("title.chart.new")}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/firstUse.ftl b/src/main/resources/templates/firstUse.ftl
index 684ec857750771b227276014c9a65b27e71d406e..0c5638a6c23d82540e3da37b3eab6b6f546a36ad 100644
--- a/src/main/resources/templates/firstUse.ftl
+++ b/src/main/resources/templates/firstUse.ftl
@@ -2,7 +2,7 @@
<head>
<#import "helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.firstUseGuide')}"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/hotkeys.ftl b/src/main/resources/templates/hotkeys.ftl
index bbd4e01d2f0099a723b36b1271952c3dbe2cb87d..1b691576092f247b825178957483f6d3a7488adb 100644
--- a/src/main/resources/templates/hotkeys.ftl
+++ b/src/main/resources/templates/hotkeys.ftl
@@ -2,7 +2,7 @@
<head>
<#import "helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.hotkeys')}"/>
<@header.style "hotkeys"/>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl
index 68ecfdc83e621e20819517fd95e5c198ae8822e2..e5b9699a4f1cd6189bb4945fa448e1334dfa1c82 100644
--- a/src/main/resources/templates/login.ftl
+++ b/src/main/resources/templates/login.ftl
@@ -2,7 +2,7 @@
<head>
<#import "helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('login.button')}"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
</head>
diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl
index 26dafa98906902a34733ca9853406a031a1774c3..a75dcf57daafc88005ddc587031e969c6d1a81c7 100644
--- a/src/main/resources/templates/reports/reports.ftl
+++ b/src/main/resources/templates/reports/reports.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.reports')}"/>
<@header.style "reports"/>
<@header.style "globalDatepicker"/>
<@header.style "collapsible"/>
diff --git a/src/main/resources/templates/search/search.ftl b/src/main/resources/templates/search/search.ftl
index b6400c1ad3a18dedbe1e488fb7ce096087485efd..be386748123b9ab85c7bc7dbdf5dd1e7f123d894 100644
--- a/src/main/resources/templates/search/search.ftl
+++ b/src/main/resources/templates/search/search.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('search')}"/>
<@header.style "transactions"/>
<@header.style "categories"/>
<@header.style "search"/>
diff --git a/src/main/resources/templates/settings/import.ftl b/src/main/resources/templates/settings/import.ftl
index ac42815c53495894a2f2799de8042ee819c3fd0a..0d6b872c35b845b360e3de6488f67342ef824843 100644
--- a/src/main/resources/templates/settings/import.ftl
+++ b/src/main/resources/templates/settings/import.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('settings.database.import')}"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/settings/settings.ftl b/src/main/resources/templates/settings/settings.ftl
index 55de2f615ea544929f36b54d6866ce8bfc1726a0..a74b0e8dc388da0080843d7a95970ab5c695a8d0 100644
--- a/src/main/resources/templates/settings/settings.ftl
+++ b/src/main/resources/templates/settings/settings.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.settings')}"/>
<@header.style "settings"/>
<#import "/spring.ftl" as s>
</head>
diff --git a/src/main/resources/templates/templates/newTemplate.ftl b/src/main/resources/templates/templates/newTemplate.ftl
index 66b75b8ddd74a77e9afcb523fa7ac22c86357496..319a80230db520c9533397e390411c2023e088e9 100644
--- a/src/main/resources/templates/templates/newTemplate.ftl
+++ b/src/main/resources/templates/templates/newTemplate.ftl
@@ -2,7 +2,13 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <#if isEdit>
+ <#assign title=locale.getString("title.template.edit")/>
+ <#else>
+ <#assign title=locale.getString("title.template.new")/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
@@ -20,7 +26,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="headline"><#if isEdit>${locale.getString("title.template.edit")}<#else>${locale.getString("title.template.new")}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/templates/templates.ftl b/src/main/resources/templates/templates/templates.ftl
index 859dc2e1ff33a997d6aa8a39073ede4d323b000b..5266e7ea5b7706220ad587f35e03b485ce15df55 100644
--- a/src/main/resources/templates/templates/templates.ftl
+++ b/src/main/resources/templates/templates/templates.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.templates')}"/>
<@header.style "collapsible"/>
<@header.style "templates"/>
<#import "/spring.ftl" as s>
diff --git a/src/main/resources/templates/transactions/newTransactionNormal.ftl b/src/main/resources/templates/transactions/newTransactionNormal.ftl
index 2f1cf4e441607329067a5317ac4693b2d59b54eb..9de5fcfafaf1dd538820198bb991c5822fcdb563 100644
--- a/src/main/resources/templates/transactions/newTransactionNormal.ftl
+++ b/src/main/resources/templates/transactions/newTransactionNormal.ftl
@@ -2,7 +2,14 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <#assign title = locale.getString("title.transaction.new.normal")/>
+ <#if isEdit>
+ <#assign title=locale.getString("title.transaction.edit", title)/>
+ <#else>
+ <#assign title=locale.getString("title.transaction.new", title)/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
@@ -19,8 +26,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <#assign title = locale.getString("title.transaction.new.normal")/>
- <div class="headline"><#if isEdit>${locale.getString("title.transaction.edit", title)}<#else>${locale.getString("title.transaction.new", title)}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/transactions/newTransactionRepeating.ftl b/src/main/resources/templates/transactions/newTransactionRepeating.ftl
index ac2af6bd814f35aced032caa3546aa42b6544096..2ccd845034a4c5def4ee99720e3adb9ced84eca8 100644
--- a/src/main/resources/templates/transactions/newTransactionRepeating.ftl
+++ b/src/main/resources/templates/transactions/newTransactionRepeating.ftl
@@ -2,7 +2,14 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <#assign title = locale.getString("title.transaction.new.repeating.long")/>
+ <#if isEdit>
+ <#assign title=locale.getString("title.transaction.edit", title)/>
+ <#else>
+ <#assign title=locale.getString("title.transaction.new", title)/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
@@ -18,8 +25,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <#assign title = locale.getString("title.transaction.new.repeating.long")/>
- <div class="headline"><#if isEdit>${locale.getString("title.transaction.edit", title)}<#else>${locale.getString("title.transaction.new", title)}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
index 862272589eef82e6c4a196d2fc7a79a969383fc5..98590a583be40ce6f6b4d4bb996d54899d440920 100644
--- a/src/main/resources/templates/transactions/newTransactionTransfer.ftl
+++ b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
@@ -2,7 +2,14 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <#assign title = locale.getString("title.transaction.new.transfer")/>
+ <#if isEdit>
+ <#assign title=locale.getString("title.transaction.edit", title)/>
+ <#else>
+ <#assign title=locale.getString("title.transaction.new", title)/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
@@ -19,8 +26,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <#assign title = locale.getString("title.transaction.new.transfer")/>
- <div class="headline"><#if isEdit>${locale.getString("title.transaction.edit", title)}<#else>${locale.getString("title.transaction.new", title)}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/transactions/transactions.ftl b/src/main/resources/templates/transactions/transactions.ftl
index 0083dc2d16461eb7128bdb944f7c53b2b2c36604..18c9a7cffaa99ba7b33671624446d49aad7d7384 100644
--- a/src/main/resources/templates/transactions/transactions.ftl
+++ b/src/main/resources/templates/transactions/transactions.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.transactions')}"/>
<@header.style "categories"/>
<@header.style "transactions"/>
<@header.style "globalDatepicker"/>