diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index c072a8f..5854b50 100644
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'رقمي',
     'Organization'             => 'منظمة',
     'OrganizationName'         => 'اسم المنظمة',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'صفحة',
     'Parent'                   => 'الأبوين',
     'Parents'                  => 'آباء',
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
index ee47995..d04d954 100644
--- a/Theme/Backend/Lang/cs.lang.php
+++ b/Theme/Backend/Lang/cs.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numeric.',
     'Organization'             => 'Organizace',
     'OrganizationName'         => 'Název organizace',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Strana',
     'Parent'                   => 'Rodič',
     'Parents'                  => 'Rodiče',
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
index a517607..5bdad7d 100644
--- a/Theme/Backend/Lang/da.lang.php
+++ b/Theme/Backend/Lang/da.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numerisk',
     'Organization'             => 'Organisation',
     'OrganizationName'         => 'Organisationens navn',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Side',
     'Parent'                   => 'Forælder',
     'Parents'                  => 'Forældre',
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index 9bbd0e6..cf8b3e1 100644
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numerisch',
     'Organization'             => 'Organisation',
     'OrganizationName'         => 'Organisationsname',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Buchseite',
     'Parent'                   => 'Elternteil',
     'Parents'                  => 'Eltern',
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
index 92f0674..9c6c8c0 100644
--- a/Theme/Backend/Lang/el.lang.php
+++ b/Theme/Backend/Lang/el.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Αριθμητικός',
     'Organization'             => 'Οργάνωση',
     'OrganizationName'         => 'Όνομα Οργανισμού',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Σελίδα',
     'Parent'                   => 'Μητρική εταιρεία',
     'Parents'                  => 'Γονείς',
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 3afafef..0e09e55 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -52,7 +52,7 @@ return ['Admin' => [
     'Delete'                   => 'Delete',
     'Description'              => 'Description',
     'Design'                   => 'Design',
-    'Destination'              => '',
+    'Destination'              => 'Destination',
     'Ele'                      => 'Ele.',
     'Element'                  => 'Element',
     'Email'                    => 'Email',
@@ -105,7 +105,6 @@ return ['Admin' => [
     'Numeric'                  => 'Numeric',
     'Organization'             => 'Organization',
     'OrganizationName'         => 'Organization Name',
-    'PAges'                    => '',
     'Page'                     => 'Page',
     'Parent'                   => 'Parent',
     'Parents'                  => 'Parents',
@@ -124,8 +123,8 @@ return ['Admin' => [
     'Read'                     => 'Read',
     'Release'                  => 'Release',
     'Reset'                    => 'Reset',
-    'Route'                    => '',
-    'Routes'                   => '',
+    'Route'                    => 'Route',
+    'Routes'                   => 'Routes',
     'Running'                  => 'Running',
     'Sea'                      => 'Sea',
     'Search'                   => 'Search',
@@ -162,7 +161,7 @@ return ['Admin' => [
     'Update'                   => 'Update',
     'Uppercase'                => 'Uppercase',
     'Username'                 => 'Username',
-    'Value'                    => '',
+    'Value'                    => 'Value',
     'Version'                  => 'Version',
     'VeryFast'                 => 'Very Fast',
     'VeryHeavy'                => 'Very Heavy',
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
index 0fcfaca..accb3b7 100644
--- a/Theme/Backend/Lang/es.lang.php
+++ b/Theme/Backend/Lang/es.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numérico',
     'Organization'             => 'Organización',
     'OrganizationName'         => 'Nombre de la Organización',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Página',
     'Parent'                   => 'Padre',
     'Parents'                  => 'Padres',
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
index 069671b..ae645b2 100644
--- a/Theme/Backend/Lang/fi.lang.php
+++ b/Theme/Backend/Lang/fi.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numeerinen',
     'Organization'             => 'Organisaatio',
     'OrganizationName'         => 'Organisaation nimi',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Sivu',
     'Parent'                   => 'Vanhempi',
     'Parents'                  => 'Vanhemmat',
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
index 32c19ad..e09d2a8 100644
--- a/Theme/Backend/Lang/fr.lang.php
+++ b/Theme/Backend/Lang/fr.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numérique',
     'Organization'             => 'Organisation',
     'OrganizationName'         => 'nom de l\'organisation',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Page',
     'Parent'                   => 'Parent',
     'Parents'                  => 'Parents',
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
index 8c80f38..b063f9b 100644
--- a/Theme/Backend/Lang/hu.lang.php
+++ b/Theme/Backend/Lang/hu.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Számszerű',
     'Organization'             => 'Szervezet',
     'OrganizationName'         => 'Szervezet neve',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Oldal',
     'Parent'                   => 'Szülő',
     'Parents'                  => 'Szülők',
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
index 9673b2f..76cf100 100644
--- a/Theme/Backend/Lang/it.lang.php
+++ b/Theme/Backend/Lang/it.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numerico',
     'Organization'             => 'Organizzazione',
     'OrganizationName'         => 'Nome dell\'organizzazione',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Pagina',
     'Parent'                   => 'Genitore',
     'Parents'                  => 'Genitori',
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
index 8e21f61..8613169 100644
--- a/Theme/Backend/Lang/ja.lang.php
+++ b/Theme/Backend/Lang/ja.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => '数字の数',
     'Organization'             => '組織',
     'OrganizationName'         => '組織名',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'ページ',
     'Parent'                   => '親',
     'Parents'                  => '両親',
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
index c8fd44f..730842d 100644
--- a/Theme/Backend/Lang/ko.lang.php
+++ b/Theme/Backend/Lang/ko.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => '숫자',
     'Organization'             => '조직',
     'OrganizationName'         => '조직 이름',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => '페이지',
     'Parent'                   => '부모의',
     'Parents'                  => '부모',
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
index 91d59f1..d1c1a32 100644
--- a/Theme/Backend/Lang/no.lang.php
+++ b/Theme/Backend/Lang/no.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numerisk',
     'Organization'             => 'Organisasjon',
     'OrganizationName'         => 'Organisasjonsnavn',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Side',
     'Parent'                   => 'Foreldre',
     'Parents'                  => 'Foreldre',
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
index 97bd38c..088d1d9 100644
--- a/Theme/Backend/Lang/pl.lang.php
+++ b/Theme/Backend/Lang/pl.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numeryczny',
     'Organization'             => 'Organizacja',
     'OrganizationName'         => 'Nazwa organizacji',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Strona',
     'Parent'                   => 'Rodzic',
     'Parents'                  => 'Rodzice',
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
index 3ef61d4..1cb5e59 100644
--- a/Theme/Backend/Lang/pt.lang.php
+++ b/Theme/Backend/Lang/pt.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numérico',
     'Organization'             => 'Organização',
     'OrganizationName'         => 'Nome da organização',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Página',
     'Parent'                   => 'Pai',
     'Parents'                  => 'Pais',
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
index 2890ddd..39a60fb 100644
--- a/Theme/Backend/Lang/ru.lang.php
+++ b/Theme/Backend/Lang/ru.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Численность',
     'Organization'             => 'Организация',
     'OrganizationName'         => 'Название организации',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Страница',
     'Parent'                   => 'Родитель',
     'Parents'                  => 'Родители',
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
index 0063537..8e25e43 100644
--- a/Theme/Backend/Lang/sv.lang.php
+++ b/Theme/Backend/Lang/sv.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Numerisk',
     'Organization'             => 'Organisation',
     'OrganizationName'         => 'organisations namn',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Sida',
     'Parent'                   => 'Förälder',
     'Parents'                  => 'Föräldrar',
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
index 552cd32..97e11be 100644
--- a/Theme/Backend/Lang/th.lang.php
+++ b/Theme/Backend/Lang/th.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'เป็นตัวเลข',
     'Organization'             => 'องค์กร',
     'OrganizationName'         => 'ชื่อองค์กร',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'หน้าหนังสือ',
     'Parent'                   => 'พ่อแม่',
     'Parents'                  => 'ผู้ปกครอง',
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
index 5c7a9e2..38e2a5f 100644
--- a/Theme/Backend/Lang/tr.lang.php
+++ b/Theme/Backend/Lang/tr.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Sayısal',
     'Organization'             => 'Organizasyon',
     'OrganizationName'         => 'Kuruluş Adı',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Sayfa',
     'Parent'                   => 'Ebeveyn',
     'Parents'                  => 'Ebeveynler',
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
index ddb384d..ab29ac8 100644
--- a/Theme/Backend/Lang/uk.lang.php
+++ b/Theme/Backend/Lang/uk.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => 'Числовий',
     'Organization'             => 'Організація',
     'OrganizationName'         => 'Назва організації',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => 'Сторінка',
     'Parent'                   => 'Батько',
     'Parents'                  => 'Батьки',
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
index 20846ad..e1bf536 100644
--- a/Theme/Backend/Lang/zh.lang.php
+++ b/Theme/Backend/Lang/zh.lang.php
@@ -105,7 +105,7 @@ return ['Admin' => [
     'Numeric'                  => '数字',
     'Organization'             => '组织',
     'OrganizationName'         => '机构名称',
-    'PAges'                    => '#VALUE!',
+    'Pages'                    => '#VALUE!',
     'Page'                     => '页',
     'Parent'                   => '父母',
     'Parents'                  => '父母',
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index 8a350a3..aa01dec 100755
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -91,9 +91,11 @@ echo $this->getData('nav')->render(); ?>
                             <i class="filter fa fa-filter"></i>
                         </label>
                     <tbody>
-                        <?php $c                                                          = 0; foreach ($accounts as $key => $value) : ++$c;
-                        $url                                                              = UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId());
-                        $color                                                            = 'darkred';
+                        <?php
+                        $c     = 0; foreach ($accounts as $key => $value) : ++$c;
+                        $url   = UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId());
+                        $color = 'darkred';
+
                         if ($value->getStatus() === AccountStatus::ACTIVE) { $color       = 'green'; }
                         elseif ($value->getStatus() === AccountStatus::INACTIVE) { $color = 'darkblue'; }
                         elseif ($value->getStatus() === AccountStatus::TIMEOUT) { $color  = 'purple'; }
@@ -101,9 +103,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                     <td data-label="<?= $this->getHtml('Status'); ?>"><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->getHtml('Status'. $value->getStatus()); ?></span></a>
-                    <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml(
-                                \sprintf('%3$s %2$s %1$s', $value->name1, $value->name2, $value->name3)
-                            ); ?></a>
+                    <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->name1, $value->name2, $value->name3, $value->login])); ?></a>
                     <td data-label="<?= $this->getHtml('Activity'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getLastActive()->format('Y-m-d H:i:s')); ?></a>
                     <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d H:i:s')); ?></a>
                         <?php endforeach; ?>
diff --git a/Theme/Backend/page-list.tpl.php b/Theme/Backend/page-list.tpl.php
index 7b044f0..8137857 100644
--- a/Theme/Backend/page-list.tpl.php
+++ b/Theme/Backend/page-list.tpl.php
@@ -30,7 +30,7 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="portlet">
             <div class="portlet-head">
-                <?= $this->getHtml('PAges'); ?>
+                <?= $this->getHtml('Pages'); ?>
             </div>
             <div class="slider">
             <table id="accountList" class="default sticky">
@@ -99,9 +99,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                     <td data-label="<?= $this->getHtml('Status'); ?>"><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->getHtml('Status'. $value->getStatus()); ?></span></a>
-                    <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml(
-                                \sprintf('%3$s %2$s %1$s', $value->name1, $value->name2, $value->name3)
-                            ); ?></a>
+                    <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->name1, $value->name2, $value->name3, $value->login])); ?></a>
                     <td data-label="<?= $this->getHtml('Activity'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getLastActive()->format('Y-m-d H:i:s')); ?></a>
                     <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d H:i:s')); ?></a>
                         <?php endforeach; ?>