diff --git a/app/templates/add.html b/app/templates/add.html
index 20bc62b9..a89bd559 100644
--- a/app/templates/add.html
+++ b/app/templates/add.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-{% block title %}{{lang.menu_links.add_proxy|title()}}{% endblock %}
-{% block h2 %}{{lang.menu_links.add_proxy|title()}}{% endblock %}
+{% block title %}{{lang.menu_links.add_proxy.title}}{% endblock %}
+{% block h2 %}{{lang.menu_links.add_proxy.title}}{% endblock %}
{% block content %}
{% from 'include/input_macros.html' import input, checkbox, select %}
{% set balance_params = dict() %}
diff --git a/app/templates/add_nginx.html b/app/templates/add_nginx.html
index d113df96..d7d7afbe 100644
--- a/app/templates/add_nginx.html
+++ b/app/templates/add_nginx.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-{% block title %}{{lang.menu_links.add_proxy|title()}}{% endblock %}
-{% block h2 %}{{lang.menu_links.add_proxy|title()}}{% endblock %}
+{% block title %}{{lang.menu_links.add_proxy.title}}{% endblock %}
+{% block h2 %}{{lang.menu_links.add_proxy.title}}{% endblock %}
{% block content %}
{% from 'include/input_macros.html' import input, checkbox, select %}
{% set balance_params = dict() %}
diff --git a/app/templates/ha.html b/app/templates/ha.html
index 1d82b3c5..605b83fe 100644
--- a/app/templates/ha.html
+++ b/app/templates/ha.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-{% block title %}{{ lang.menu_links.ha|title() }} {% endblock %}
-{% block h2 %}{{ lang.menu_links.ha|title() }} {% endblock %}
+{% block title %}{{ lang.menu_links.ha.title }} {% endblock %}
+{% block h2 %}{{ lang.menu_links.ha.title }} {% endblock %}
{% block content %}
{% from 'include/input_macros.html' import input, checkbox %}
diff --git a/app/templates/history.html b/app/templates/history.html
index dfb5d7ff..074bc4bd 100644
--- a/app/templates/history.html
+++ b/app/templates/history.html
@@ -1,7 +1,7 @@
{% from 'include/input_macros.html' import copy_to_clipboard %}
{% extends "base.html" %}
-{% block title %}{{ lang.menu_links.history|title() }} {{ lang.words[service] }}{% endblock %}
-{% block h2 %}{{ lang.menu_links.history|title() }} {{ lang.words[service] }}{% endblock %}
+{% block title %}{{ lang.menu_links.history.title }} {{ lang.words[service] }}{% endblock %}
+{% block h2 %}{{ lang.menu_links.history.title }} {{ lang.words[service] }}{% endblock %}
{% block content %}
{% if user_status == 0 or user_plan == 'user' %}
{% include 'include/no_sub.html' %}
diff --git a/app/templates/ovw.html b/app/templates/ovw.html
index 75e27a8e..5366f3c2 100644
--- a/app/templates/ovw.html
+++ b/app/templates/ovw.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% block title %}{{lang.menu_links.overview|title()}}{% endblock %}
+{% block title %}{{lang.menu_links.overview.title}}{% endblock %}
{% block h2 %}{{lang.menu_links.overview.h2}}{% endblock %}
{% block content %}
diff --git a/app/templates/servers.html b/app/templates/servers.html
index 99654909..451431aa 100644
--- a/app/templates/servers.html
+++ b/app/templates/servers.html
@@ -1,4 +1,6 @@
{% extends "base.html" %}
+{% block title %}{{lang.menu_links.servers.title}}{% endblock %}
+{% block h2 %}{{lang.menu_links.servers.title}}{% endblock %}
{% block content %}
{% from 'include/input_macros.html' import input, checkbox, select, copy_to_clipboard %}