diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index cf782e0..d0a0dea 100755
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -22,6 +22,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiDataChange',
             'verb'       => RouteVerb::ANY,
+            'csrf'       => true,
             'permission' => [
             ],
         ],
@@ -48,6 +49,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiLogout',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
             ],
         ],
@@ -74,6 +76,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiSettingsSet',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -83,6 +86,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiSettingsGet',
             'verb'       => RouteVerb::GET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -95,6 +99,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiSettingsDesignSet',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -107,6 +112,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupCreate',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -116,6 +122,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupUpdate',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -125,6 +132,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupDelete',
             'verb'       => RouteVerb::DELETE,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::DELETE,
@@ -134,6 +142,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupGet',
             'verb'       => RouteVerb::GET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -146,6 +155,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountFind',
             'verb'       => RouteVerb::GET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -157,6 +167,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupFind',
             'verb'       => RouteVerb::GET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -168,6 +179,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountGroupFind',
             'verb'       => RouteVerb::GET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -180,6 +192,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountCreate',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -189,6 +202,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountUpdate',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -198,6 +212,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountDelete',
             'verb'       => RouteVerb::DELETE,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::DELETE,
@@ -207,6 +222,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountGet',
             'verb'       => RouteVerb::GET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -218,6 +234,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiSettingsAccountLocalizationSet',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -230,6 +247,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiModuleStatusUpdate',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -242,6 +260,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAddAccountToGroup',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -253,6 +272,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAddGroupToAccount',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -265,6 +285,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupPermissionGet',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -274,6 +295,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAddGroupPermission',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -283,6 +305,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupPermissionUpdate',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -292,6 +315,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiGroupPermissionDelete',
             'verb'       => RouteVerb::DELETE,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -303,6 +327,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountPermissionGet',
             'verb'       => RouteVerb::GET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -312,6 +337,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAddAccountPermission',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -321,6 +347,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountPermissionUpdate',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -330,6 +357,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiAccountPermissionDelete',
             'verb'       => RouteVerb::DELETE,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::PERMISSION,
@@ -341,6 +369,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiReInit',
             'verb'       => RouteVerb::GET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -353,6 +382,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiUpdateFile',
             'verb'       => RouteVerb::GET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -364,6 +394,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -375,6 +406,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -386,6 +418,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiAddressCreate',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -395,6 +428,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiAddressUpdate',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -404,6 +438,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiAddressDelete',
             'verb'       => RouteVerb::DELETE,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::DELETE,
@@ -415,6 +450,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiContactCreate',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -424,6 +460,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiContactUpdate',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -433,6 +470,7 @@ return [
         [
             'dest'       => '\Modules\Admin\Controller\ApiAttributeController:apiContactDelete',
             'verb'       => RouteVerb::DELETE,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::DELETE,
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index e117c41..07ccc0b 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -57,7 +57,7 @@ echo $this->data['nav']->render();
         <div class="row">
             <div class="col-xs-12 col-md-6">
                 <section class="portlet">
-                    <form id="iGeneralSettings" action="<?= UriFactory::build('{/api}admin/settings/general'); ?>" method="post">
+                    <form id="iGeneralSettings" action="<?= UriFactory::build('{/api}admin/settings/general?csrf={$CSRF}'); ?>" method="post">
                         <div class="portlet-head"><?= $this->getHtml('Settings'); ?></div>
                         <div class="portlet-body">
                             <div class="form-group">
@@ -75,7 +75,7 @@ echo $this->data['nav']->render();
 
             <div class="col-xs-12 col-md-6">
                 <section class="portlet">
-                    <form id="iGeneralSettings" action="<?= UriFactory::build('{/api}admin/settings/general'); ?>" method="post">
+                    <form id="iGeneralSettings" action="<?= UriFactory::build('{/api}admin/settings/general?csrf={$CSRF}'); ?>" method="post">
                         <div class="portlet-head"><?= $this->getHtml('ServerStatus'); ?></div>
                         <div class="portlet-body">
                             <div class="form-group">
@@ -94,7 +94,7 @@ echo $this->data['nav']->render();
 
             <div class="col-xs-12 col-md-6">
                 <section class="portlet">
-                    <form id="iSecuritySettings" action="<?= UriFactory::build('{/api}admin/settings/general'); ?>" method="post">
+                    <form id="iSecuritySettings" action="<?= UriFactory::build('{/api}admin/settings/general?csrf={$CSRF}'); ?>" method="post">
                         <div class="portlet-head"><?= $this->getHtml('Security'); ?></div>
                         <div class="portlet-body">
                             <div class="form-group">
@@ -153,7 +153,7 @@ echo $this->data['nav']->render();
             <div class="col-xs-12 col-md-6">
                 <section class="portlet">
                     <form id="iLoggingSettings"
-                        action="<?= UriFactory::build('{/api}admin/settings/general'); ?>"
+                        action="<?= UriFactory::build('{/api}admin/settings/general?csrf={$CSRF}'); ?>"
                         method="post">
                         <div class="portlet-head"><?= $this->getHtml('Logging'); ?></div>
                         <div class="portlet-body">
@@ -185,7 +185,7 @@ echo $this->data['nav']->render();
                 <div class="portlet">
                     <form id="fLocalization"
                         name="fLocalization"
-                        action="<?= UriFactory::build('{/api}profile/settings/localization'); ?>"
+                        action="<?= UriFactory::build('{/api}profile/settings/localization?csrf={$CSRF}'); ?>"
                         method="post">
                         <div class="portlet-head"><?= $this->getHtml('Localization'); ?></div>
                         <div class="portlet-body">
@@ -199,7 +199,7 @@ echo $this->data['nav']->render();
                                             <?php endforeach; ?>
                                         </select>
                                     </div>
-                                    <div class="ipt-second"><input type="submit" name="loadDefaultLocalization" formaction="<?= UriFactory::build('{/api}profile/settings/localization?load=1'); ?>" value="<?= $this->getHtml('Load'); ?>"></div>
+                                    <div class="ipt-second"><input type="submit" name="loadDefaultLocalization" formaction="<?= UriFactory::build('{/api}profile/settings/localization?load=1&csrf={$CSRF}'); ?>" value="<?= $this->getHtml('Load'); ?>"></div>
                                 </div>
                             </div>
 
@@ -678,7 +678,7 @@ echo $this->data['nav']->render();
                                         {"key": 1, "type": "event.prevent"},
                                         {"key": 2, "type": "dom.click", "selector": "#iLoginImageUpload"}
                                     ]}]'><?= $this->getHtml('Change'); ?></a>
-                                    <form id="iLoginImageUploadForm" action="<?= UriFactory::build('{/api}admin/settings/design'); ?>" method="post">
+                                    <form id="iLoginImageUploadForm" action="<?= UriFactory::build('{/api}admin/settings/design?csrf={$CSRF}'); ?>" method="post">
                                         <input class="preview" data-action='[
                                             {"listener": "change", "key": 1, "action": [
                                                 {"key": 1, "type": "form.submit", "selector": "#iLoginImageUploadForm"}
@@ -790,8 +790,8 @@ echo $this->data['nav']->render();
                                 </label>
                         <tbody>
                         <?php $count          = 0;
-                            $previousSettings = empty($settings) ? 'admin/settings/general' : 'admin/settings/general?{?}&sid=' . \reset($settings)->id . '&ptype=p';
-                            $nextSettings     = empty($settings) ? 'admin/settings/general' : 'admin/settings/general?{?}&sid=' . \end($settings)->id . '&ptype=n';
+                            $previousSettings = empty($settings) ? 'admin/settings/general?csrf={$CSRF}' : 'admin/settings/general?{?}&sid=' . \reset($settings)->id . '&ptype=p';
+                            $nextSettings     = empty($settings) ? 'admin/settings/general?csrf={$CSRF}' : 'admin/settings/general?{?}&sid=' . \end($settings)->id . '&ptype=n';
 
                             foreach ($settings as $key => $setting) : ++$count;
                         ?>
diff --git a/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php b/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php
index 96dedbb..c8532d4 100644
--- a/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php
+++ b/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php
@@ -41,7 +41,7 @@ $categories  = ISO639Enum::getConstants();
                                         ]
                                     }
                                 ]'><i class="g-icon">book</i></button>
-                                <input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="Guest" data-action='[
+                                <input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" data-action='[
                                     {
                                         "key": 1, "listener": "keyup", "action": [
                                             {"key": 1, "type": "validate.keypress", "pressed": "!13!37!38!39!40"},
diff --git a/Theme/Backend/Components/AddressEditor/addresses.tpl.php b/Theme/Backend/Components/AddressEditor/addresses.tpl.php
index 2dfa117..eb53297 100644
--- a/Theme/Backend/Components/AddressEditor/addresses.tpl.php
+++ b/Theme/Backend/Components/AddressEditor/addresses.tpl.php
@@ -24,7 +24,7 @@ $types     = AddressType::getConstants();
 <div class="row">
     <div class="col-xs-12 col-md-6">
         <section class="portlet">
-            <form id="addressForm" action="<?= UriFactory::build('{api}account/address'); ?>" method="post"
+            <form id="addressForm" action="<?= UriFactory::build('{api}account/address?csrf={$CSRF}'); ?>" method="post"
                 data-ui-container="#addressTable tbody"
                 data-add-form="addressForm"
                 data-add-tpl="#addressTable tbody .oms-add-tpl-address">
diff --git a/Theme/Backend/Components/ContactEditor/contacts.tpl.php b/Theme/Backend/Components/ContactEditor/contacts.tpl.php
index 1e75696..bf8b76e 100644
--- a/Theme/Backend/Components/ContactEditor/contacts.tpl.php
+++ b/Theme/Backend/Components/ContactEditor/contacts.tpl.php
@@ -26,7 +26,7 @@ $subtypes  = AddressType::getConstants();
 <div class="row">
     <div class="col-xs-12 col-md-6">
         <section class="portlet">
-            <form id="contactForm" action="<?= UriFactory::build('{api}account/contact'); ?>" method="post"
+            <form id="contactForm" action="<?= UriFactory::build('{api}account/contact?csrf={$CSRF}'); ?>" method="post"
                 data-ui-container="#contactTable tbody"
                 data-add-form="contactForm"
                 data-add-tpl="#contactTable tbody .oms-add-tpl-contact">
diff --git a/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php
index ab6453b..dfdf002 100755
--- a/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php
+++ b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php
@@ -13,7 +13,7 @@
                         ]
                     }
                 ]'><i class="g-icon">book</i></button>
-                <input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="Guest" data-action='[
+                <input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" data-action='[
                     {
                         "key": 1, "listener": "keyup", "action": [
                             {"key": 1, "type": "validate.keypress", "pressed": "!13!37!38!39!40"},
diff --git a/Theme/Backend/Components/Localization/l11n-view.tpl.php b/Theme/Backend/Components/Localization/l11n-view.tpl.php
new file mode 100644
index 0000000..d2e08ad
--- /dev/null
+++ b/Theme/Backend/Components/Localization/l11n-view.tpl.php
@@ -0,0 +1,513 @@
+<?php
+
+use phpOMS\Localization\ISO3166NameEnum;
+use phpOMS\Localization\ISO3166TwoEnum;
+use phpOMS\Localization\ISO4217Enum;
+use phpOMS\Localization\ISO639Enum;
+use phpOMS\Localization\ISO8601EnumArray;
+use phpOMS\Localization\TimeZoneEnumArray;
+use phpOMS\Uri\UriFactory;
+use phpOMS\Utils\Converter\AreaType;
+use phpOMS\Utils\Converter\LengthType;
+use phpOMS\Utils\Converter\SpeedType;
+use phpOMS\Utils\Converter\TemperatureType;
+use phpOMS\Utils\Converter\VolumeType;
+use phpOMS\Utils\Converter\WeightType;
+use phpOMS\System\File\Local\Directory;
+
+$countryCodes    = ISO3166TwoEnum::getConstants();
+$countries       = ISO3166NameEnum::getConstants();
+$timezones       = TimeZoneEnumArray::getConstants();
+$timeformats     = ISO8601EnumArray::getConstants();
+$languages       = ISO639Enum::getConstants();
+$currencies      = ISO4217Enum::getConstants();
+$l11nDefinitions = Directory::list(__DIR__ . '/../../../../phpOMS/Localization/Defaults/Definitions');
+
+$weights      = WeightType::getConstants();
+$speeds       = SpeedType::getConstants();
+$areas        = AreaType::getConstants();
+$lengths      = LengthType::getConstants();
+$volumes      = VolumeType::getConstants();
+$temperatures = TemperatureType::getConstants();
+?>
+<div class="row">
+    <div class="col-xs-12 col-md-4">
+        <div class="portlet">
+            <form id="fLocalization" name="fLocalization" action="<?= UriFactory::build('{/api}profile/settings/localization?csrf={$CSRF}'); ?>" method="post">
+            <div class="portlet-head"><?= $this->getHtml('Localization'); ?></div>
+            <div class="portlet-body">
+                <div class="form-group">
+                    <label for="iDefaultLocalizations"><?= $this->getHtml('Defaults'); ?></label>
+                    <div class="ipt-wrap wf-100">
+                        <div class="ipt-first"><select id="iDefaultLocalizations" name="localization_load">
+                                <option value="-1" selected disabled><?= $this->getHtml('Customized'); ?>
+                                <?php foreach ($l11nDefinitions as $def) : ?>
+                                    <option value="<?= $this->printHtml(\explode('.', $def)[0]); ?>"><?= $this->printHtml(\explode('.', $def)[0]); ?>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="ipt-second"><input type="submit" name="loadDefaultLocalization" formaction="<?= UriFactory::build('{/api}profile/settings/localization?csrf={$CSRF}'); ?>" value="<?= $this->getHtml('Load'); ?>"></div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label for="iCountries"><?= $this->getHtml('Country'); ?></label>
+                    <select id="iCountries" name="settings_country">
+                        <?php foreach ($countryCodes as $code3 => $code2) : ?>
+                        <option value="<?= $this->printHtml($code2); ?>"<?= $this->printHtml($code2 === $l11n->country ? ' selected' : ''); ?>><?= $this->printHtml($countries[$code3]); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iLanguages"><?= $this->getHtml('Language'); ?></label>
+                    <select id="iLanguages" name="settings_language">
+                        <?php foreach ($languages as $code => $language) : $code = \strtolower(\substr($code, 1)); ?>
+                        <option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml($code === $l11n->language ? ' selected' : ''); ?>><?= $this->printHtml($language); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iTemperature"><?= $this->getHtml('Temperature'); ?></label>
+                    <select id="iTemperature" name="settings_temperature">
+                        <?php foreach ($temperatures as $temperature) : ?>
+                        <option value="<?= $this->printHtml($temperature); ?>"<?= $this->printHtml($temperature === $l11n->getTemperature() ? ' selected' : ''); ?>><?= $this->printHtml($temperature); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+            <div class="portlet-foot">
+                <input type="hidden" name="account_id" value="<?= $account->id; ?>">
+                <input id="iSubmitLocalization" name="submitLocalization" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
+            </div>
+            </form>
+        </div>
+    </div>
+
+    <div class="col-xs-12 col-md-4">
+        <div class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Time'); ?></div>
+            <div class="portlet-body">
+                <div class="form-group">
+                    <label for="iTimezones"><?= $this->getHtml('Timezone'); ?></label>
+                    <select form="fLocalization" id="iTimezones" name="settings_timezone">
+                        <?php foreach ($timezones as $timezone) : ?>
+                        <option value="<?= $this->printHtml($timezone); ?>"<?= $this->printHtml($timezone === $l11n->getTimezone() ? ' selected' : ''); ?>><?= $this->printHtml($timezone); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                <h2><?= $this->getHtml('Timeformat'); ?></h2>
+                </div>
+
+                <div class="form-group">
+                    <label for="iTimeformatVeryShort"><?= $this->getHtml('VeryShort'); ?></label>
+                    <input form="fLocalization" id="iTimeformatVeryShort" name="settings_timeformat_vs" type="text" value="<?= $this->printHtml($l11n->getDatetime()['very_short']); ?>" placeholder="d.m" required>
+                </div>
+
+                <div class="form-group">
+                    <label for="iTimeformatShort"><?= $this->getHtml('Short'); ?></label>
+                    <input form="fLocalization" id="iTimeformatShort" name="settings_timeformat_s" type="text" value="<?= $this->printHtml($l11n->getDatetime()['short']); ?>" placeholder="m.y" required>
+                </div>
+
+                <div class="form-group">
+                    <label for="iTimeformatMedium"><?= $this->getHtml('Medium'); ?></label>
+                    <input form="fLocalization" id="iTimeformatMedium" name="settings_timeformat_m" type="text" value="<?= $this->printHtml($l11n->getDatetime()['medium']); ?>" placeholder="Y.m.d" required>
+                </div>
+
+                <div class="form-group">
+                    <label for="iTimeformatLong"><?= $this->getHtml('Long'); ?></label>
+                    <input form="fLocalization" id="iTimeformatLong" name="settings_timeformat_l" type="text" value="<?= $this->printHtml($l11n->getDatetime()['long']); ?>" placeholder="Y.m.d h:i" required>
+                </div>
+
+                <div class="form-group">
+                    <label for="iTimeformatVeryLong"><?= $this->getHtml('VeryLong'); ?></label>
+                    <input form="fLocalization" id="iTimeformatVeryLong" name="settings_timeformat_vl" type="text" value="<?= $this->printHtml($l11n->getDatetime()['very_long']); ?>" placeholder="Y.m.d h:i:s" required>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-xs-12 col-md-4">
+        <div class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Numeric'); ?></div>
+            <div class="portlet-body">
+                <div class="form-group">
+                    <label for="iCurrencies"><?= $this->getHtml('Currency'); ?></label>
+                    <select form="fLocalization" id="iCurrencies" name="settings_currency">
+                        <?php foreach ($currencies as $code => $currency) : $code = \substr($code, 1); ?>
+                        <option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml($code === $l11n->currency ? ' selected' : ''); ?>><?= $this->printHtml($currency); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label><?= $this->getHtml('Currencyformat'); ?></label>
+                    <select form="fLocalization" name="settings_currencyformat">
+                        <option value="0"<?= $this->printHtml($l11n->getCurrencyFormat() === '0' ? ' selected' : ''); ?>><?= $this->getHtml('Amount') , ' ' , $this->printHtml($l11n->currency); ?>
+                        <option value="1"<?= $this->printHtml($l11n->getCurrencyFormat() === '1' ? ' selected' : ''); ?>><?= $this->printHtml($l11n->currency) , ' ' , $this->getHtml('Amount'); ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                <h2><?= $this->getHtml('Numberformat'); ?></h2>
+                </div>
+
+                <div class="flex-line">
+                    <div>
+                        <div class="form-group">
+                            <label for="iDecimalPoint"><?= $this->getHtml('DecimalPoint'); ?></label>
+                            <input form="fLocalization" id="iDecimalPoint" name="settings_decimal" type="text" value="<?= $this->printHtml($l11n->getDecimal()); ?>" placeholder="." required>
+                        </div>
+                    </div>
+
+                    <div>
+                        <div class="form-group">
+                            <label for="iThousandSep"><?= $this->getHtml('ThousandsSeparator'); ?></label>
+                            <input form="fLocalization" id="iThousandSep" name="settings_thousands" type="text" value="<?= $this->printHtml($l11n->getThousands()); ?>" placeholder="," required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-xs-12 col-md-4">
+        <div class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Precision'); ?></div>
+            <div class="portlet-body">
+                <div class="form-group">
+                    <label for="iPrecisionVeryShort"><?= $this->getHtml('VeryShort'); ?></label>
+                    <input form="fLocalization" id="iPrecisionVeryShort" name="settings_precision_vs" value="<?= $l11n->getPrecision()['very_short']; ?>" type="number">
+                </div>
+
+                <div class="form-group">
+                    <label for="iPrecisionShort"><?= $this->getHtml('Short'); ?></label>
+                    <input form="fLocalization" id="iPrecisionLight" name="settings_precision_s" value="<?= $l11n->getPrecision()['short']; ?>" type="number">
+                </div>
+
+                <div class="form-group">
+                    <label for="iPrecisionMedium"><?= $this->getHtml('Medium'); ?></label>
+                    <input form="fLocalization" id="iPrecisionMedium" name="settings_precision_m" value="<?= $l11n->getPrecision()['medium']; ?>" type="number">
+                </div>
+
+                <div class="form-group">
+                    <label for="iPrecisionLong"><?= $this->getHtml('Long'); ?></label>
+                    <input form="fLocalization" id="iPrecisionLong" name="settings_precision_l" value="<?= $l11n->getPrecision()['long']; ?>" type="number">
+                </div>
+
+                <div class="form-group">
+                    <label for="iPrecisionVeryLong"><?= $this->getHtml('VeryLong'); ?></label>
+                    <input form="fLocalization" id="iPrecisionVeryLong" name="settings_precision_vl" value="<?= $l11n->getPrecision()['very_long']; ?>" type="number">
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-xs-12 col-md-4">
+        <div class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Weight'); ?></div>
+            <div class="portlet-body">
+                <div class="form-group">
+                    <label for="iWeightVeryLight"><?= $this->getHtml('VeryLight'); ?></label>
+                    <select form="fLocalization" id="iWeightVeryLight" name="settings_weight_vl">
+                        <?php foreach ($weights as $code => $weight) : ?>
+                        <option value="<?= $this->printHtml($weight); ?>"<?= $this->printHtml($weight === $l11n->getWeight()['very_light'] ? ' selected' : ''); ?>><?= $this->printHtml($weight); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iWeightLight"><?= $this->getHtml('Light'); ?></label>
+                    <select form="fLocalization" id="iWeightLight" name="settings_weight_l">
+                        <?php foreach ($weights as $code => $weight) : ?>
+                        <option value="<?= $this->printHtml($weight); ?>"<?= $this->printHtml($weight === $l11n->getWeight()['light'] ? ' selected' : ''); ?>><?= $this->printHtml($weight); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iWeightMedium"><?= $this->getHtml('Medium'); ?></label>
+                    <select form="fLocalization" id="iWeightMedium" name="settings_weight_m">
+                        <?php foreach ($weights as $code => $weight) : ?>
+                        <option value="<?= $this->printHtml($weight); ?>"<?= $this->printHtml($weight === $l11n->getWeight()['medium'] ? ' selected' : ''); ?>><?= $this->printHtml($weight); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iWeightHeavy"><?= $this->getHtml('Heavy'); ?></label>
+                    <select form="fLocalization" id="iWeightHeavy" name="settings_weight_h">
+                        <?php foreach ($weights as $code => $weight) : ?>
+                        <option value="<?= $this->printHtml($weight); ?>"<?= $this->printHtml($weight === $l11n->getWeight()['heavy'] ? ' selected' : ''); ?>><?= $this->printHtml($weight); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iWeightVeryHeavy"><?= $this->getHtml('VeryHeavy'); ?></label>
+                    <select form="fLocalization" id="iWeightVeryHeavy" name="settings_weight_vh">
+                        <?php foreach ($weights as $code => $weight) : ?>
+                        <option value="<?= $this->printHtml($weight); ?>"<?= $this->printHtml($weight === $l11n->getWeight()['very_heavy'] ? ' selected' : ''); ?>><?= $this->printHtml($weight); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-xs-12 col-md-4">
+        <div class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Speed'); ?></div>
+            <div class="portlet-body">
+                <div class="form-group">
+                    <label for="iSpeedVerySlow"><?= $this->getHtml('VerySlow'); ?></label>
+                    <select form="fLocalization" id="iSpeedVerySlow" name="settings_speed_vs">
+                        <?php foreach ($speeds as $code => $speed) : ?>
+                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['very_slow'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iSpeedSlow"><?= $this->getHtml('Slow'); ?></label>
+                    <select form="fLocalization" id="iSpeedSlow" name="settings_speed_s">
+                        <?php foreach ($speeds as $code => $speed) : ?>
+                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['slow'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iSpeedMedium"><?= $this->getHtml('Medium'); ?></label>
+                    <select form="fLocalization" id="iSpeedMedium" name="settings_speed_m">
+                        <?php foreach ($speeds as $code => $speed) : ?>
+                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['medium'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iSpeedFast"><?= $this->getHtml('Fast'); ?></label>
+                    <select form="fLocalization" id="iSpeedFast" name="settings_speed_f">
+                        <?php foreach ($speeds as $code => $speed) : ?>
+                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['fast'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iSpeedVeryFast"><?= $this->getHtml('VeryFast'); ?></label>
+                    <select form="fLocalization" id="iSpeedVeryFast" name="settings_speed_vf">
+                        <?php foreach ($speeds as $code => $speed) : ?>
+                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['very_fast'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iSpeedSea"><?= $this->getHtml('Sea'); ?></label>
+                    <select form="fLocalization" id="iSpeedSea" name="settings_speed_sea">
+                        <?php foreach ($speeds as $code => $speed) : ?>
+                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['sea'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-xs-12 col-md-4">
+        <div class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Length'); ?></div>
+            <div class="portlet-body">
+                <div class="form-group">
+                    <label for="iLengthVeryShort"><?= $this->getHtml('VeryShort'); ?></label>
+                    <select form="fLocalization" id="iLengthVeryShort" name="settings_length_vs">
+                        <?php foreach ($lengths as $code => $length) : ?>
+                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['very_short'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iLengthShort"><?= $this->getHtml('Short'); ?></label>
+                    <select form="fLocalization" id="iLengthShort" name="settings_length_s">
+                        <?php foreach ($lengths as $code => $length) : ?>
+                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['short'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iLengthMedium"><?= $this->getHtml('Medium'); ?></label>
+                    <select form="fLocalization" id="iLengthMedium" name="settings_length_m">
+                        <?php foreach ($lengths as $code => $length) : ?>
+                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['medium'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iLengthLong"><?= $this->getHtml('Long'); ?></label>
+                    <select form="fLocalization" id="iLengthLong" name="settings_length_l">
+                        <?php foreach ($lengths as $code => $length) : ?>
+                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['long'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iLengthVeryLong"><?= $this->getHtml('VeryLong'); ?></label>
+                    <select form="fLocalization" id="iLengthVeryLong" name="settings_length_vl">
+                        <?php foreach ($lengths as $code => $length) : ?>
+                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['very_long'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iLengthSea"><?= $this->getHtml('Sea'); ?></label>
+                    <select form="fLocalization" id="iLengthSea" name="settings_length_sea">
+                        <?php foreach ($lengths as $code => $length) : ?>
+                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['sea'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-xs-12 col-md-4">
+        <div class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Area'); ?></div>
+            <div class="portlet-body">
+                <div class="form-group">
+                    <label for="iAreaVerySmall"><?= $this->getHtml('VerySmall'); ?></label>
+                    <select form="fLocalization" id="iAreaVerySmall" name="settings_area_vs">
+                        <?php foreach ($areas as $code => $area) : ?>
+                        <option value="<?= $this->printHtml($area); ?>"<?= $this->printHtml($area === $l11n->getArea()['very_small'] ? ' selected' : ''); ?>><?= $this->printHtml($area); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iAreaSmall"><?= $this->getHtml('Small'); ?></label>
+                    <select form="fLocalization" id="iAreaSmall" name="settings_area_s">
+                        <?php foreach ($areas as $code => $area) : ?>
+                        <option value="<?= $this->printHtml($area); ?>"<?= $this->printHtml($area === $l11n->getArea()['small'] ? ' selected' : ''); ?>><?= $this->printHtml($area); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iAreaMedium"><?= $this->getHtml('Medium'); ?></label>
+                    <select form="fLocalization" id="iAreaMedium" name="settings_area_m">
+                        <?php foreach ($areas as $code => $area) : ?>
+                        <option value="<?= $this->printHtml($area); ?>"<?= $this->printHtml($area === $l11n->getArea()['medium'] ? ' selected' : ''); ?>><?= $this->printHtml($area); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iAreaLarge"><?= $this->getHtml('Large'); ?></label>
+                    <select form="fLocalization" id="iAreaLarge" name="settings_area_l">
+                        <?php foreach ($areas as $code => $area) : ?>
+                        <option value="<?= $this->printHtml($area); ?>"<?= $this->printHtml($area === $l11n->getArea()['large'] ? ' selected' : ''); ?>><?= $this->printHtml($area); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iAreaVeryLarge"><?= $this->getHtml('VeryLarge'); ?></label>
+                    <select form="fLocalization" id="iAreaVeryLarge" name="settings_area_vl">
+                        <?php foreach ($areas as $code => $area) : ?>
+                        <option value="<?= $this->printHtml($area); ?>"<?= $this->printHtml($area === $l11n->getArea()['very_large'] ? ' selected' : ''); ?>><?= $this->printHtml($area); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-xs-12 col-md-4">
+        <div class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Volume'); ?></div>
+            <div class="portlet-body">
+                <div class="form-group">
+                    <label for="iVolumeVerySmall"><?= $this->getHtml('VerySmall'); ?></label>
+                    <select form="fLocalization" id="iVolumeVerySmall" name="settings_volume_vs">
+                        <?php foreach ($volumes as $code => $volume) : ?>
+                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['very_small'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iVolumeSmall"><?= $this->getHtml('Small'); ?></label>
+                    <select form="fLocalization" id="iVolumeSmall" name="settings_volume_s">
+                        <?php foreach ($volumes as $code => $volume) : ?>
+                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['small'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iVolumeMedium"><?= $this->getHtml('Medium'); ?></label>
+                    <select form="fLocalization" id="iVolumeMedium" name="settings_volume_m">
+                        <?php foreach ($volumes as $code => $volume) : ?>
+                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['medium'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iVolumeLarge"><?= $this->getHtml('Large'); ?></label>
+                    <select form="fLocalization" id="iVolumeLarge" name="settings_volume_l">
+                        <?php foreach ($volumes as $code => $volume) : ?>
+                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['large'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iVolumeVeryLarge"><?= $this->getHtml('VeryLarge'); ?></label>
+                    <select form="fLocalization" id="iVolumeVeryLarge" name="settings_volume_vl">
+                        <?php foreach ($volumes as $code => $volume) : ?>
+                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['very_large'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iVolumeTeaspoon"><?= $this->getHtml('Teaspoon'); ?></label>
+                    <select form="fLocalization" id="iVolumeTeaspoon" name="settings_volume_teaspoon">
+                        <?php foreach ($volumes as $code => $volume) : ?>
+                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['teaspoon'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iVolumeTablespoon"><?= $this->getHtml('Tablespoon'); ?></label>
+                    <select form="fLocalization" id="iVolumeTablespoon" name="settings_volume_tablespoon">
+                        <?php foreach ($volumes as $code => $volume) : ?>
+                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['tablespoon'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iVolumeGlass"><?= $this->getHtml('Glass'); ?></label>
+                    <select form="fLocalization" id="iVolumeGlass" name="settings_volume_glass">
+                        <?php foreach ($volumes as $code => $volume) : ?>
+                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['glass'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index 75b7fb2..173c1b0 100755
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-create.tpl.php
@@ -22,66 +22,73 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12 col-md-6">
         <div class="portlet">
-            <form id="fAccount" action="<?= UriFactory::build('{/api}admin/account'); ?>" method="put">
+            <form id="fAccount" action="<?= UriFactory::build('{/api}admin/account?csrf={$CSRF}'); ?>" method="put">
                 <div class="portlet-head"><?= $this->getHtml('Account'); ?></div>
                 <div class="portlet-body">
                     <div class="form-group">
                         <label for="iType"><?= $this->getHtml('Type'); ?></label>
                         <select id="Type" name="type">
-                                    <option value="<?= $this->printHtml((string) AccountType::USER); ?>"><?= $this->getHtml('Person'); ?>
-                                    <option value="<?= $this->printHtml((string) AccountType::GROUP); ?>"><?= $this->getHtml('Organization'); ?>
-                                </select>
+                            <option value="<?= AccountType::USER; ?>"><?= $this->getHtml('Person'); ?>
+                            <option value="<?= AccountType::GROUP; ?>"><?= $this->getHtml('Organization'); ?>
+                        </select>
                     </div>
+
                     <div class="form-group">
                         <label for="iStatus"><?= $this->getHtml('Status'); ?></label>
                         <select id="iStatus" name="status">
-                                    <option value="<?= $this->printHtml((string) AccountStatus::ACTIVE); ?>"><?= $this->getHtml('Active'); ?>
-                                    <option value="<?= $this->printHtml((string) AccountStatus::INACTIVE); ?>"><?= $this->getHtml('Inactive'); ?>
-                                    <option value="<?= $this->printHtml((string) AccountStatus::TIMEOUT); ?>"><?= $this->getHtml('Timeout'); ?>
-                                    <option value="<?= $this->printHtml((string) AccountStatus::BANNED); ?>"><?= $this->getHtml('Banned'); ?>
-                                </select>
+                            <option value="<?= AccountStatus::ACTIVE; ?>"><?= $this->getHtml('Active'); ?>
+                            <option value="<?= AccountStatus::INACTIVE; ?>"><?= $this->getHtml('Inactive'); ?>
+                            <option value="<?= AccountStatus::TIMEOUT; ?>"><?= $this->getHtml('Timeout'); ?>
+                            <option value="<?= AccountStatus::BANNED; ?>"><?= $this->getHtml('Banned'); ?>
+                        </select>
                     </div>
+
                     <div class="form-group">
                         <label for="iUsername"><?= $this->getHtml('Username'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="g-icon">person</i></button>
-                                    <input id="iUsername" name="name" type="text" autocomplete="off" spellcheck="false">
-                                </span>
+                            <button class="inactive" type="button"><i class="g-icon">person</i></button>
+                            <input id="iUsername" name="name" type="text" autocomplete="off" spellcheck="false">
+                        </span>
                     </div>
+
                     <div class="form-group">
                         <label for="iName1"><?= $this->getHtml('Name1'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="g-icon">person</i></button>
-                                    <input id="iName1" name="name1" type="text" autocomplete="off" spellcheck="false" required>
-                                </span>
+                            <button class="inactive" type="button"><i class="g-icon">person</i></button>
+                            <input id="iName1" name="name1" type="text" autocomplete="off" spellcheck="false" required>
+                        </span>
                     </div>
+
                     <div class="form-group">
                         <label for="iName2"><?= $this->getHtml('Name2'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="g-icon">person</i></button>
-                                    <input id="iName2" name="name2" type="text" autocomplete="off" spellcheck="false">
-                                </span>
+                            <button class="inactive" type="button"><i class="g-icon">person</i></button>
+                            <input id="iName2" name="name2" type="text" autocomplete="off" spellcheck="false">
+                        </span>
                     </div>
+
                     <div class="form-group">
                         <label for="iName3"><?= $this->getHtml('Name3'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="g-icon">person</i></button>
-                                    <input id="iName3" name="name3" type="text" autocomplete="off" spellcheck="false">
-                                </span>
+                            <button class="inactive" type="button"><i class="g-icon">person</i></button>
+                            <input id="iName3" name="name3" type="text" autocomplete="off" spellcheck="false">
+                        </span>
                     </div>
+
                     <div class="form-group">
                         <label for="iEmail"><?= $this->getHtml('Email'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="g-icon">mail</i></button>
-                                    <input id="iEmail" name="email" type="email" autocomplete="off" spellcheck="false">
-                                </span>
+                            <button class="inactive" type="button"><i class="g-icon">mail</i></button>
+                            <input id="iEmail" name="email" type="email" autocomplete="off" spellcheck="false">
+                        </span>
                     </div>
+
                     <div class="form-group">
                         <label for="iPassword"><?= $this->getHtml('Password'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="g-icon">lock</i></button>
-                                    <input id="iPassword" name="password" type="password">
-                                </span>
+                            <button class="inactive" type="button"><i class="g-icon">lock</i></button>
+                            <input id="iPassword" name="password" type="password">
+                        </span>
                     </div>
                 </div>
                 <div class="portlet-foot">
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index 2245f8b..dd63669 100755
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -24,7 +24,7 @@ $accounts = $this->data['accounts'] ?? [];
 $tableView            = $this->data['tableView'];
 $tableView->id        = 'accountsList';
 $tableView->baseUri   = 'admin/account/list';
-$tableView->exportUri = '{/api}admin/account/list/export';
+$tableView->exportUri = '{/api}admin/account/list/export?csrf={$CSRF}';
 $tableView->setObjects($accounts);
 
 $previous = $tableView->getPreviousLink(
@@ -106,6 +106,7 @@ echo $this->data['nav']->render(); ?>
                         <?php endif; ?>
             </table>
             </div>
+            <!--
             <?php if ($this->getData('hasPrevious') || $this->getData('hasNext')) : ?>
             <div class="portlet-foot">
                 <?php if ($this->getData('hasPrevious')) : ?>
@@ -116,6 +117,7 @@ echo $this->data['nav']->render(); ?>
                 <?php endif; ?>
             </div>
             <?php endif; ?>
+            -->
         </div>
     </div>
 </div>
diff --git a/Theme/Backend/accounts-view.tpl.php b/Theme/Backend/accounts-view.tpl.php
index 16af482..d73b761 100644
--- a/Theme/Backend/accounts-view.tpl.php
+++ b/Theme/Backend/accounts-view.tpl.php
@@ -16,20 +16,7 @@ use phpOMS\Account\AccountStatus;
 use phpOMS\Account\AccountType;
 use phpOMS\Account\PermissionOwner;
 use phpOMS\Account\PermissionType;
-use phpOMS\Localization\ISO3166NameEnum;
-use phpOMS\Localization\ISO3166TwoEnum;
-use phpOMS\Localization\ISO4217Enum;
-use phpOMS\Localization\ISO639Enum;
-use phpOMS\Localization\ISO8601EnumArray;
-use phpOMS\Localization\TimeZoneEnumArray;
-use phpOMS\System\File\Local\Directory;
 use phpOMS\Uri\UriFactory;
-use phpOMS\Utils\Converter\AreaType;
-use phpOMS\Utils\Converter\LengthType;
-use phpOMS\Utils\Converter\SpeedType;
-use phpOMS\Utils\Converter\TemperatureType;
-use phpOMS\Utils\Converter\VolumeType;
-use phpOMS\Utils\Converter\WeightType;
 
 /**
  * @var \phpOMS\Views\View $this
@@ -43,7 +30,7 @@ $audits = $this->data['audits'] ?? [];
 $tableView            = $this->data['tableView'];
 $tableView->id        = 'auditList';
 $tableView->baseUri   = '{/base}/admin/account/settings?id=' . $account->id;
-$tableView->exportUri = '{/api}auditor/list/export';
+$tableView->exportUri = '{/api}auditor/list/export?csrf={$CSRF}';
 $tableView->setObjects($audits);
 
 $previous = $tableView->getPreviousLink(
@@ -75,7 +62,7 @@ echo $this->data['nav']->render(); ?>
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <div class="portlet">
-                        <form id="account-edit" action="<?= UriFactory::build('{/api}admin/account'); ?>" method="post">
+                        <form id="account-edit" action="<?= UriFactory::build('{/api}admin/account?csrf={$CSRF}'); ?>" method="post">
                             <div class="portlet-head"><?= $this->getHtml('Account'); ?></div>
                             <div class="portlet-body">
                                 <div class="form-group">
@@ -170,7 +157,7 @@ echo $this->data['nav']->render(); ?>
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <div class="portlet">
-                        <form id="iAddGroupToAccount" action="<?= UriFactory::build('{/api}admin/account/group'); ?>" method="put">
+                        <form id="iAddGroupToAccount" action="<?= UriFactory::build('{/api}admin/account/group?csrf={$CSRF}'); ?>" method="put">
                             <div class="portlet-head"><?= $this->getHtml('Groups'); ?></div>
                             <div class="portlet-body">
                                 <div class="form-group">
@@ -222,7 +209,7 @@ echo $this->data['nav']->render(); ?>
                 <div class="col-xs-12 col-md-6">
                 <div class="portlet">
                         <form id="permissionForm"
-                            action="<?= UriFactory::build('{/api}admin/account/permission'); ?>"
+                            action="<?= UriFactory::build('{/api}admin/account/permission?csrf={$CSRF}'); ?>"
                             data-ui-container="#permissionTable tbody"
                             data-add-form="permissionForm"
                             data-add-tpl="#permissionTable tbody .oms-add-tpl-permission"
@@ -420,471 +407,9 @@ echo $this->data['nav']->render(); ?>
             </div>
         </div>
 
-        <?php
-            $countryCodes    = ISO3166TwoEnum::getConstants();
-            $countries       = ISO3166NameEnum::getConstants();
-            $timezones       = TimeZoneEnumArray::getConstants();
-            $timeformats     = ISO8601EnumArray::getConstants();
-            $languages       = ISO639Enum::getConstants();
-            $currencies      = ISO4217Enum::getConstants();
-            $l11nDefinitions = Directory::list(__DIR__ . '/../../../../phpOMS/Localization/Defaults/Definitions');
-
-            $weights      = WeightType::getConstants();
-            $speeds       = SpeedType::getConstants();
-            $areas        = AreaType::getConstants();
-            $lengths      = LengthType::getConstants();
-            $volumes      = VolumeType::getConstants();
-            $temperatures = TemperatureType::getConstants();
-        ?>
         <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>>
         <div class="tab">
-            <div class="row">
-                <div class="col-xs-12 col-md-4">
-                    <div class="portlet">
-                        <form id="fLocalization" name="fLocalization" action="<?= UriFactory::build('{/api}admin/account/localization'); ?>" method="post">
-                            <div class="portlet-head"><?= $this->getHtml('Localization'); ?></div>
-                            <div class="portlet-body">
-                                <div class="form-group">
-                                    <label for="iDefaultLocalizations"><?= $this->getHtml('Defaults'); ?></label>
-                                    <div class="ipt-wrap">
-                                        <div class="ipt-first"><select id="iDefaultLocalizations" name="localization_load">
-                                                <option selected disabled><?= $this->getHtml('Customized'); ?>
-                                                <?php foreach ($l11nDefinitions as $def) : ?>
-                                                    <option value="<?= $this->printHtml(\explode('.', $def)[0]); ?>"><?= $this->printHtml(\explode('.', $def)[0]); ?>
-                                                <?php endforeach; ?>
-                                            </select>
-                                        </div>
-                                        <div class="ipt-second"><input type="submit" name="loadDefaultLocalization" formaction="<?= UriFactory::build('{/api}profile/settings/localization?load=1'); ?>" value="<?= $this->getHtml('Load'); ?>"></div>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iCountries"><?= $this->getHtml('Country'); ?></label>
-                                    <select id="iCountries" name="settings_country">
-                                        <?php foreach ($countryCodes as $code3 => $code2) : ?>
-                                        <option value="<?= $this->printHtml($code2); ?>"<?= $this->printHtml($code2 === $l11n->country ? ' selected' : ''); ?>><?= $this->printHtml($countries[$code3]); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iLanguages"><?= $this->getHtml('Language'); ?></label>
-                                    <select id="iLanguages" name="settings_language">
-                                        <?php foreach ($languages as $code => $language) : $code = \strtolower(\substr($code, 1)); ?>
-                                        <option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml($code === $l11n->language ? ' selected' : ''); ?>><?= $this->printHtml($language); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iTemperature"><?= $this->getHtml('Temperature'); ?></label>
-                                    <select id="iTemperature" name="settings_temperature">
-                                        <?php foreach ($temperatures as $temperature) : ?>
-                                            <option value="<?= $this->printHtml($temperature); ?>"<?= $this->printHtml($temperature === $l11n->getTemperature() ? ' selected' : ''); ?>><?= $this->printHtml($temperature); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="portlet-foot">
-                                <input type="hidden" name="account_id" value="<?= $account->id; ?>">
-                                <input id="iSubmitLocalization" name="submitLocalization" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
-                            </div>
-                        </form>
-                    </div>
-                </div>
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Time'); ?></div>
-                        <div class="portlet-body">
-                            <form>
-                                <div class="form-group">
-                                    <label for="iTimezones"><?= $this->getHtml('Timezone'); ?></label>
-                                    <select form="fLocalization" id="iTimezones" name="settings_timezone">
-                                        <?php foreach ($timezones as $timezone) : ?>
-                                        <option value="<?= $this->printHtml($timezone); ?>"<?= $this->printHtml($timezone === $l11n->getTimezone() ? ' selected' : ''); ?>><?= $this->printHtml($timezone); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <h2><?= $this->getHtml('Timeformat'); ?></h2>
-                                <div class="form-group">
-                                    <label for="iTimeformatVeryShort"><?= $this->getHtml('VeryShort'); ?></label>
-                                    <input form="fLocalization" id="iTimeformatVeryShort" name="settings_timeformat_vs" type="text" value="<?= $this->printHtml($l11n->getDatetime()['very_short']); ?>" placeholder="Y" required>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iTimeformatShort"><?= $this->getHtml('Short'); ?></label>
-                                    <input form="fLocalization" id="iTimeformatShort" name="settings_timeformat_s" type="text" value="<?= $this->printHtml($l11n->getDatetime()['short']); ?>" placeholder="Y" required>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iTimeformatMedium"><?= $this->getHtml('Medium'); ?></label>
-                                    <input form="fLocalization" id="iTimeformatMedium" name="settings_timeformat_m" type="text" value="<?= $this->printHtml($l11n->getDatetime()['medium']); ?>" placeholder="Y" required>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iTimeformatLong"><?= $this->getHtml('Long'); ?></label>
-                                    <input form="fLocalization" id="iTimeformatLong" name="settings_timeformat_l" type="text" value="<?= $this->printHtml($l11n->getDatetime()['long']); ?>" placeholder="Y" required>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iTimeformatVeryLong"><?= $this->getHtml('VeryLong'); ?></label>
-                                    <input form="fLocalization" id="iTimeformatVeryLong" name="settings_timeformat_vl" type="text" value="<?= $this->printHtml($l11n->getDatetime()['very_long']); ?>" placeholder="Y" required>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Numeric'); ?></div>
-                        <div class="portlet-body">
-                            <form>
-                                <div class="form-group">
-                                    <label for="iCurrencies"><?= $this->getHtml('Currency'); ?></label>
-                                    <select form="fLocalization" id="iCurrencies" name="settings_currency">
-                                        <?php foreach ($currencies as $code => $currency) : $code = \substr($code, 1); ?>
-                                        <option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml($code === $l11n->currency ? ' selected' : ''); ?>><?= $this->printHtml($currency); ?>
-                                            <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label><?= $this->getHtml('Currencyformat'); ?></label>
-                                    <select form="fLocalization" name="settings_currencyformat">
-                                        <option value="0"<?= $this->printHtml($l11n->getCurrencyFormat() === '0' ? ' selected' : ''); ?>><?= $this->getHtml('Amount') , ' ' , $this->printHtml($l11n->currency); ?>
-                                        <option value="1"<?= $this->printHtml($l11n->getCurrencyFormat() === '1' ? ' selected' : ''); ?>><?= $this->printHtml($l11n->currency) , ' ' , $this->getHtml('Amount'); ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label><?= $this->getHtml('Numberformat'); ?>   </label>
-                                    <div class="form-group">
-                                        <label for="iDecimalPoint"><?= $this->getHtml('DecimalPoint'); ?></label>
-                                        <input form="fLocalization" id="iDecimalPoint" name="settings_decimal" type="text" value="<?= $this->printHtml($l11n->getDecimal()); ?>" placeholder="." required>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="iThousandSep"><?= $this->getHtml('ThousandsSeparator'); ?></label>
-                                        <input form="fLocalization" id="iThousandSep" name="settings_thousands" type="text" value="<?= $this->printHtml($l11n->getThousands()); ?>" placeholder="," required>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Precision'); ?></div>
-                        <div class="portlet-body">
-                            <form>
-                                <div class="form-group">
-                                    <label for="iPrecisionVeryShort"><?= $this->getHtml('VeryShort'); ?></label>
-                                    <input form="fLocalization" id="iPrecisionVeryShort" name="settings_precision_vs" value="<?= $l11n->getPrecision()['very_short']; ?>" type="number">
-                                </div>
-                                <div class="form-group">
-                                    <label for="iPrecisionShort"><?= $this->getHtml('Short'); ?></label>
-                                    <input form="fLocalization" id="iPrecisionLight" name="settings_precision_s" value="<?= $l11n->getPrecision()['short']; ?>" type="number">
-                                </div>
-                                <div class="form-group">
-                                    <label for="iPrecisionMedium"><?= $this->getHtml('Medium'); ?></label>
-                                    <input form="fLocalization" id="iPrecisionMedium" name="settings_precision_m" value="<?= $l11n->getPrecision()['medium']; ?>" type="number">
-                                </div>
-                                <div class="form-group">
-                                    <label for="iPrecisionLong"><?= $this->getHtml('Long'); ?></label>
-                                    <input form="fLocalization" id="iPrecisionLong" name="settings_precision_l" value="<?= $l11n->getPrecision()['long']; ?>" type="number">
-                                </div>
-                                <div class="form-group">
-                                    <label for="iPrecisionVeryLong"><?= $this->getHtml('VeryLong'); ?></label>
-                                    <input form="fLocalization" id="iPrecisionVeryLong" name="settings_precision_vl" value="<?= $l11n->getPrecision()['very_long']; ?>" type="number">
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Weight'); ?></div>
-                        <div class="portlet-body">
-                            <form>
-                                <div class="form-group">
-                                    <label for="iWeightVeryLight"><?= $this->getHtml('VeryLight'); ?></label>
-                                    <select form="fLocalization" id="iWeightVeryLight" name="settings_weight_vl">
-                                        <?php foreach ($weights as $code => $weight) : ?>
-                                        <option value="<?= $this->printHtml($weight); ?>"<?= $this->printHtml($weight === $l11n->getWeight()['very_light'] ? ' selected' : ''); ?>><?= $this->printHtml($weight); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iWeightLight"><?= $this->getHtml('Light'); ?></label>
-                                    <select form="fLocalization" id="iWeightLight" name="settings_weight_l">
-                                        <?php foreach ($weights as $code => $weight) : ?>
-                                        <option value="<?= $this->printHtml($weight); ?>"<?= $this->printHtml($weight === $l11n->getWeight()['light'] ? ' selected' : ''); ?>><?= $this->printHtml($weight); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iWeightMedium"><?= $this->getHtml('Medium'); ?></label>
-                                    <select form="fLocalization" id="iWeightMedium" name="settings_weight_m">
-                                        <?php foreach ($weights as $code => $weight) : ?>
-                                        <option value="<?= $this->printHtml($weight); ?>"<?= $this->printHtml($weight === $l11n->getWeight()['medium'] ? ' selected' : ''); ?>><?= $this->printHtml($weight); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iWeightHeavy"><?= $this->getHtml('Heavy'); ?></label>
-                                    <select form="fLocalization" id="iWeightHeavy" name="settings_weight_h">
-                                        <?php foreach ($weights as $code => $weight) : ?>
-                                        <option value="<?= $this->printHtml($weight); ?>"<?= $this->printHtml($weight === $l11n->getWeight()['heavy'] ? ' selected' : ''); ?>><?= $this->printHtml($weight); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iWeightVeryHeavy"><?= $this->getHtml('VeryHeavy'); ?></label>
-                                    <select form="fLocalization" id="iWeightVeryHeavy" name="settings_weight_vh">
-                                        <?php foreach ($weights as $code => $weight) : ?>
-                                        <option value="<?= $this->printHtml($weight); ?>"<?= $this->printHtml($weight === $l11n->getWeight()['very_heavy'] ? ' selected' : ''); ?>><?= $this->printHtml($weight); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Speed'); ?></div>
-                        <div class="portlet-body">
-                            <form>
-                                <div class="form-group">
-                                    <label for="iSpeedVerySlow"><?= $this->getHtml('VerySlow'); ?></label>
-                                    <select form="fLocalization" id="iSpeedVerySlow" name="settings_speed_vs">
-                                        <?php foreach ($speeds as $code => $speed) : ?>
-                                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['very_slow'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iSpeedSlow"><?= $this->getHtml('Slow'); ?></label>
-                                    <select form="fLocalization" id="iSpeedSlow" name="settings_speed_s">
-                                        <?php foreach ($speeds as $code => $speed) : ?>
-                                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['slow'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iSpeedMedium"><?= $this->getHtml('Medium'); ?></label>
-                                    <select form="fLocalization" id="iSpeedMedium" name="settings_speed_m">
-                                        <?php foreach ($speeds as $code => $speed) : ?>
-                                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['medium'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iSpeedFast"><?= $this->getHtml('Fast'); ?></label>
-                                    <select form="fLocalization" id="iSpeedFast" name="settings_speed_f">
-                                        <?php foreach ($speeds as $code => $speed) : ?>
-                                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['fast'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iSpeedVeryFast"><?= $this->getHtml('VeryFast'); ?></label>
-                                    <select form="fLocalization" id="iSpeedVeryFast" name="settings_speed_vf">
-                                        <?php foreach ($speeds as $code => $speed) : ?>
-                                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['very_fast'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iSpeedSea"><?= $this->getHtml('Sea'); ?></label>
-                                    <select form="fLocalization" id="iSpeedSea" name="settings_speed_sea">
-                                        <?php foreach ($speeds as $code => $speed) : ?>
-                                        <option value="<?= $this->printHtml($speed); ?>"<?= $this->printHtml($speed === $l11n->getSpeed()['sea'] ? ' selected' : ''); ?>><?= $this->printHtml($speed); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Length'); ?></div>
-                        <div class="portlet-body">
-                            <form>
-                                <div class="form-group">
-                                    <label for="iLengthVeryShort"><?= $this->getHtml('VeryShort'); ?></label>
-                                    <select form="fLocalization" id="iLengthVeryShort" name="settings_length_vs">
-                                        <?php foreach ($lengths as $code => $length) : ?>
-                                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['very_short'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iLengthShort"><?= $this->getHtml('Short'); ?></label>
-                                    <select form="fLocalization" id="iLengthShort" name="settings_length_s">
-                                        <?php foreach ($lengths as $code => $length) : ?>
-                                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['short'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iLengthMedium"><?= $this->getHtml('Medium'); ?></label>
-                                    <select form="fLocalization" id="iLengthMedium" name="settings_length_m">
-                                        <?php foreach ($lengths as $code => $length) : ?>
-                                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['medium'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iLengthLong"><?= $this->getHtml('Long'); ?></label>
-                                    <select form="fLocalization" id="iLengthLong" name="settings_length_l">
-                                        <?php foreach ($lengths as $code => $length) : ?>
-                                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['long'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iLengthVeryLong"><?= $this->getHtml('VeryLong'); ?></label>
-                                    <select form="fLocalization" id="iLengthVeryLong" name="settings_length_vl">
-                                        <?php foreach ($lengths as $code => $length) : ?>
-                                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['very_long'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iLengthSea"><?= $this->getHtml('Sea'); ?></label>
-                                    <select form="fLocalization" id="iLengthSea" name="settings_length_sea">
-                                        <?php foreach ($lengths as $code => $length) : ?>
-                                        <option value="<?= $this->printHtml($length); ?>"<?= $this->printHtml($length === $l11n->getLength()['sea'] ? ' selected' : ''); ?>><?= $this->printHtml($length); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Area'); ?></div>
-                        <div class="portlet-body">
-                            <form>
-                                <div class="form-group">
-                                    <label for="iAreaVerySmall"><?= $this->getHtml('VerySmall'); ?></label>
-                                    <select form="fLocalization" id="iAreaVerySmall" name="settings_area_vs">
-                                        <?php foreach ($areas as $code => $area) : ?>
-                                        <option value="<?= $this->printHtml($area); ?>"<?= $this->printHtml($area === $l11n->getArea()['very_small'] ? ' selected' : ''); ?>><?= $this->printHtml($area); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iAreaSmall"><?= $this->getHtml('Small'); ?></label>
-                                    <select form="fLocalization" id="iAreaSmall" name="settings_area_s">
-                                        <?php foreach ($areas as $code => $area) : ?>
-                                        <option value="<?= $this->printHtml($area); ?>"<?= $this->printHtml($area === $l11n->getArea()['small'] ? ' selected' : ''); ?>><?= $this->printHtml($area); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iAreaMedium"><?= $this->getHtml('Medium'); ?></label>
-                                    <select form="fLocalization" id="iAreaMedium" name="settings_area_m">
-                                        <?php foreach ($areas as $code => $area) : ?>
-                                        <option value="<?= $this->printHtml($area); ?>"<?= $this->printHtml($area === $l11n->getArea()['medium'] ? ' selected' : ''); ?>><?= $this->printHtml($area); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iAreaLarge"><?= $this->getHtml('Large'); ?></label>
-                                    <select form="fLocalization" id="iAreaLarge" name="settings_area_l">
-                                        <?php foreach ($areas as $code => $area) : ?>
-                                        <option value="<?= $this->printHtml($area); ?>"<?= $this->printHtml($area === $l11n->getArea()['large'] ? ' selected' : ''); ?>><?= $this->printHtml($area); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iAreaVeryLarge"><?= $this->getHtml('VeryLarge'); ?></label>
-                                    <select form="fLocalization" id="iAreaVeryLarge" name="settings_area_vl">
-                                        <?php foreach ($areas as $code => $area) : ?>
-                                        <option value="<?= $this->printHtml($area); ?>"<?= $this->printHtml($area === $l11n->getArea()['very_large'] ? ' selected' : ''); ?>><?= $this->printHtml($area); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Volume'); ?></div>
-                        <div class="portlet-body">
-                            <form>
-                                <div class="form-group">
-                                    <label for="iVolumeVerySmall"><?= $this->getHtml('VerySmall'); ?></label>
-                                    <select form="fLocalization" id="iVolumeVerySmall" name="settings_volume_vs">
-                                        <?php foreach ($volumes as $code => $volume) : ?>
-                                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['very_small'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iVolumeSmall"><?= $this->getHtml('Small'); ?></label>
-                                    <select form="fLocalization" id="iVolumeSmall" name="settings_volume_s">
-                                        <?php foreach ($volumes as $code => $volume) : ?>
-                                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['small'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iVolumeMedium"><?= $this->getHtml('Medium'); ?></label>
-                                    <select form="fLocalization" id="iVolumeMedium" name="settings_volume_m">
-                                        <?php foreach ($volumes as $code => $volume) : ?>
-                                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['medium'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iVolumeLarge"><?= $this->getHtml('Large'); ?></label>
-                                    <select form="fLocalization" id="iVolumeLarge" name="settings_volume_l">
-                                        <?php foreach ($volumes as $code => $volume) : ?>
-                                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['large'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iVolumeVeryLarge"><?= $this->getHtml('VeryLarge'); ?></label>
-                                    <select form="fLocalization" id="iVolumeVeryLarge" name="settings_volume_vl">
-                                        <?php foreach ($volumes as $code => $volume) : ?>
-                                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['very_large'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iVolumeTeaspoon"><?= $this->getHtml('Teaspoon'); ?></label>
-                                    <select form="fLocalization" id="iVolumeTeaspoon" name="settings_volume_teaspoon">
-                                        <?php foreach ($volumes as $code => $volume) : ?>
-                                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['teaspoon'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iVolumeTablespoon"><?= $this->getHtml('Tablespoon'); ?></label>
-                                    <select form="fLocalization" id="iVolumeTablespoon" name="settings_volume_tablespoon">
-                                        <?php foreach ($volumes as $code => $volume) : ?>
-                                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['tablespoon'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                                <div class="form-group">
-                                    <label for="iVolumeGlass"><?= $this->getHtml('Glass'); ?></label>
-                                    <select form="fLocalization" id="iVolumeGlass" name="settings_volume_glass">
-                                        <?php foreach ($volumes as $code => $volume) : ?>
-                                        <option value="<?= $this->printHtml($volume); ?>"<?= $this->printHtml($volume === $l11n->getVolume()['glass'] ? ' selected' : ''); ?>><?= $this->printHtml($volume); ?>
-                                        <?php endforeach; ?>
-                                    </select>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <?php include __DIR__ . '/../../../Admin/Theme/Backend/Components/Localization/l11n-view.tpl.php'; ?>
         </div>
 
         <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
@@ -938,6 +463,7 @@ echo $this->data['nav']->render(); ?>
                         <?php endif; ?>
                     </table>
                     </div>
+                    <!--
                     <?php if ($this->getData('hasPrevious') || $this->getData('hasNext')) : ?>
                         <div class="portlet-foot">
                             <?php if ($this->getData('hasPrevious')) : ?>
@@ -948,6 +474,7 @@ echo $this->data['nav']->render(); ?>
                             <?php endif; ?>
                         </div>
                     <?php endif; ?>
+                    -->
                 </div>
             </div>
         </div>
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php
index 973f8e7..1a29a63 100755
--- a/Theme/Backend/groups-create.tpl.php
+++ b/Theme/Backend/groups-create.tpl.php
@@ -22,7 +22,7 @@ echo $this->data['nav']->render(); ?>
     <div class="col-xs-12 col-md-6">
         <div class="portlet">
             <form id="fGroupCreate"
-                action="<?= UriFactory::build('{/api}admin/group'); ?>"
+                action="<?= UriFactory::build('{/api}admin/group?csrf={$CSRF}'); ?>"
                 method="put"
                 autocomplete="off">
                 <div class="portlet-head"><?= $this->getHtml('Group'); ?></div>
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php
index 9ec7e73..1803b3a 100755
--- a/Theme/Backend/groups-list.tpl.php
+++ b/Theme/Backend/groups-list.tpl.php
@@ -25,7 +25,7 @@ $memberCount = $this->data['memberCount'] ?? [];
 $tableView            = $this->data['tableView'];
 $tableView->id        = 'groupsList';
 $tableView->baseUri   = 'admin/group/list';
-$tableView->exportUri = '{/api}admin/group/list/export';
+$tableView->exportUri = '{/api}admin/group/list/export?csrf={$CSRF}';
 $tableView->setObjects($groups);
 
 $previous = $tableView->getPreviousLink(
@@ -103,6 +103,7 @@ echo $this->data['nav']->render(); ?>
                     <?php endif; ?>
             </table>
             </div>
+            <!--
             <?php if ($this->getData('hasPrevious') || $this->getData('hasNext')) : ?>
             <div class="portlet-foot">
                 <?php if ($this->getData('hasPrevious')) : ?>
@@ -113,6 +114,7 @@ echo $this->data['nav']->render(); ?>
                 <?php endif; ?>
             </div>
             <?php endif; ?>
+            -->
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/Theme/Backend/groups-view.tpl.php b/Theme/Backend/groups-view.tpl.php
index 0c0e8cf..6745960 100644
--- a/Theme/Backend/groups-view.tpl.php
+++ b/Theme/Backend/groups-view.tpl.php
@@ -50,7 +50,7 @@ echo $this->data['nav']->render(); ?>
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <div class="portlet">
-                        <form id="fGroupEdit" action="<?= UriFactory::build('{/api}admin/group'); ?>" method="post">
+                        <form id="fGroupEdit" action="<?= UriFactory::build('{/api}admin/group?csrf={$CSRF}'); ?>" method="post">
                             <div class="portlet-head"><?= $this->getHtml('Group'); ?></div>
                             <div class="portlet-body">
                                 <div class="form-group">
@@ -59,7 +59,7 @@ echo $this->data['nav']->render(); ?>
                                 </div>
                                 <div class="form-group">
                                     <label for="iGname"><?= $this->getHtml('Name'); ?></label>
-                                    <input id="iGname" name="name" type="text" spellcheck="false" autocomplete="off" placeholder="Guest" value="<?= $this->printHtml($group->name); ?>">
+                                    <input id="iGname" name="name" type="text" spellcheck="false" autocomplete="off" value="<?= $this->printHtml($group->name); ?>">
                                 </div>
                                 <div class="form-group">
                                     <label for="iGstatus"><?= $this->getHtml('Status'); ?></label>
@@ -96,7 +96,7 @@ echo $this->data['nav']->render(); ?>
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <div class="portlet">
-                        <form id="iAddAccountToGroup" action="<?= UriFactory::build('{/api}admin/group/account'); ?>" method="put"
+                        <form id="iAddAccountToGroup" action="<?= UriFactory::build('{/api}admin/group/account?csrf={$CSRF}'); ?>" method="put"
                             data-ui-container="#accountTable tbody"
                             data-add-form="accountForm"
                             data-add-tpl="#accountTable tbody .oms-add-tpl-account">
@@ -175,7 +175,7 @@ echo $this->data['nav']->render(); ?>
                 <div class="col-xs-12 col-md-6">
                 <div class="portlet">
                         <form id="permissionForm"
-                            action="<?= UriFactory::build('{/api}admin/group/permission'); ?>"
+                            action="<?= UriFactory::build('{/api}admin/group/permission?csrf={$CSRF}'); ?>"
                             data-ui-container="#permissionTable tbody"
                             data-add-form="permissionForm"
                             data-add-tpl="#permissionTable tbody .oms-add-tpl-permission"
@@ -405,10 +405,12 @@ echo $this->data['nav']->render(); ?>
                                 <tr><td colspan="7" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                             <?php endif; ?>
                         </table>
+                        <!--
                         <div class="portlet-foot">
                             <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
                             <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
                         </div>
+                        -->
                     </div>
                 </div>
             </div>
diff --git a/Theme/Backend/modules-info.tpl.php b/Theme/Backend/modules-info.tpl.php
index 3735d54..3bb27db 100755
--- a/Theme/Backend/modules-info.tpl.php
+++ b/Theme/Backend/modules-info.tpl.php
@@ -52,18 +52,18 @@ if (isset($installed[$id])) {
             </div>
             <div class="portlet-foot">
                 <?php if (isset($active[$id])) : ?>
-                    <form id="fModuleDeactivate" action="<?= UriFactory::build('{/api}admin/module/status?module=' . $id); ?>" method="POST">
+                    <form id="fModuleDeactivate" action="<?= UriFactory::build('{/api}admin/module/status?module=' . $id . '&csrf={$CSRF}'); ?>" method="POST">
                         <button id="fModuleDeactivateButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::DEACTIVATE; ?>"><?= $this->getHtml('Deactivate'); ?></button>
                     </form>
                 <?php elseif (isset($installed[$id])) : ?>
                     <div class="ipt-wrap">
                         <div class="ipt-first">
-                            <form id="fModuleUninstall" action="<?= UriFactory::build('{/api}admin/module/status?module=' . $id); ?>" method="POST">
+                            <form id="fModuleUninstall" action="<?= UriFactory::build('{/api}admin/module/status?module=' . $id . '&csrf={$CSRF}'); ?>" method="POST">
                                 <button id="fModuleUninstallButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::UNINSTALL; ?>"><?= $this->getHtml('Uninstall'); ?></button>
                             </form>
                         </div>
                         <div class="ipt-second">
-                            <form id="fModuleActivate" action="<?= UriFactory::build('{/api}admin/module/status?module=' . $id); ?>" method="POST">
+                            <form id="fModuleActivate" action="<?= UriFactory::build('{/api}admin/module/status?module=' . $id . '&csrf={$CSRF}'); ?>" method="POST">
                                 <button id="fModuleActivateButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::ACTIVATE; ?>"><?= $this->getHtml('Activate'); ?></button>
                             </form>
                         </div>
@@ -71,12 +71,12 @@ if (isset($installed[$id])) {
                 <?php elseif (isset($modules[$id])) : ?>
                     <div class="ipt-wrap">
                         <div class="ipt-first">
-                            <form id="fModuleInstall" action="<?= UriFactory::build('{/api}admin/module/status?module=' . $id); ?>" method="POST">
+                            <form id="fModuleInstall" action="<?= UriFactory::build('{/api}admin/module/status?module=' . $id . '&csrf={$CSRF}'); ?>" method="POST">
                                 <button id="fModuleInstallButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::INSTALL; ?>"><?= $this->getHtml('Install'); ?></button>
                             </form>
                         </div>
                         <div class="ipt-second">
-                            <form id="fModuleDelete" action="<?= UriFactory::build('{/api}admin/module/status?module=' . $id); ?>" method="POST">
+                            <form id="fModuleDelete" action="<?= UriFactory::build('{/api}admin/module/status?module=' . $id . '&csrf={$CSRF}'); ?>" method="POST">
                                 <button id="fModuleDeleteButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::DELETE; ?>"><?= $this->getHtml('Delete'); ?></button>
                             </form>
                         </div>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php
index 68d7386..6bd243a 100755
--- a/Theme/Backend/modules-list.tpl.php
+++ b/Theme/Backend/modules-list.tpl.php
@@ -26,7 +26,7 @@ $installed = $this->data['installed'] ?? [];
 $tableView            = $this->data['tableView'];
 $tableView->id        = 'moduleList';
 $tableView->baseUri   = 'admin/module/list';
-$tableView->exportUri = '{/api}admin/module/list/export';
+$tableView->exportUri = '{/api}admin/module/list/export?csrf={$CSRF}';
 $tableView->setObjects($modules);
 ?>
 <div class="row">
diff --git a/Theme/Backend/modules-log.tpl.php b/Theme/Backend/modules-log.tpl.php
index 3a402ca..b3db41e 100755
--- a/Theme/Backend/modules-log.tpl.php
+++ b/Theme/Backend/modules-log.tpl.php
@@ -69,10 +69,12 @@ echo $this->data['nav']->render();
                 <?php endif; ?>
             </table>
             </div>
+            <!--
             <div class="portlet-foot">
                 <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
                 <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
             </div>
+            -->
         </div>
     </div>
 </div>
diff --git a/Theme/Backend/page-list.tpl.php b/Theme/Backend/page-list.tpl.php
index 95464f7..b215ebe 100755
--- a/Theme/Backend/page-list.tpl.php
+++ b/Theme/Backend/page-list.tpl.php
@@ -108,10 +108,12 @@ echo $this->data['nav']->render(); ?>
                         <?php endif; ?>
             </table>
             </div>
+            <!--
             <div class="portlet-foot">
                 <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
                 <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
             </div>
+            -->
         </div>
     </div>
 </div>
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php
index 1f01df8..f58d936 100755
--- a/Theme/Backend/settings-general.tpl.php
+++ b/Theme/Backend/settings-general.tpl.php
@@ -55,7 +55,7 @@ $l11n = $this->data['default_localization'] ?? new NullLocalization();
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="portlet">
-                        <form id="iGeneralSettings" action="<?= UriFactory::build('{/api}admin/settings/general'); ?>" method="post">
+                        <form id="iGeneralSettings" action="<?= UriFactory::build('{/api}admin/settings/general?csrf={$CSRF}'); ?>" method="post">
                             <div class="portlet-head"><?= $this->getHtml('Settings'); ?></div>
                             <div class="portlet-body">
                                 <div class="form-group">
@@ -73,7 +73,7 @@ $l11n = $this->data['default_localization'] ?? new NullLocalization();
 
                 <div class="col-xs-12 col-md-6">
                     <section class="portlet">
-                        <form id="iSecuritySettings" action="<?= UriFactory::build('{/api}admin/settings/general'); ?>" method="post">
+                        <form id="iSecuritySettings" action="<?= UriFactory::build('{/api}admin/settings/general?csrf={$CSRF}'); ?>" method="post">
                             <div class="portlet-head"><?= $this->getHtml('Security'); ?></div>
                             <div class="portlet-body">
                                 <div class="form-group">
@@ -132,7 +132,7 @@ $l11n = $this->data['default_localization'] ?? new NullLocalization();
                 <div class="col-xs-12 col-md-6">
                     <section class="portlet">
                         <form id="iLoggingSettings"
-                            action="<?= UriFactory::build('{/api}admin/settings/general'); ?>"
+                            action="<?= UriFactory::build('{/api}admin/settings/general?csrf={$CSRF}'); ?>"
                             method="post">
                             <div class="portlet-head"><?= $this->getHtml('Logging'); ?></div>
                             <div class="portlet-body">
@@ -164,7 +164,7 @@ $l11n = $this->data['default_localization'] ?? new NullLocalization();
                     <div class="portlet">
                         <form id="fLocalization"
                             name="fLocalization"
-                            action="<?= UriFactory::build('{/api}profile/settings/localization'); ?>"
+                            action="<?= UriFactory::build('{/api}profile/settings/localization?csrf={$CSRF}'); ?>"
                             method="post">
                             <div class="portlet-head"><?= $this->getHtml('Localization'); ?></div>
                             <div class="portlet-body">
@@ -178,7 +178,7 @@ $l11n = $this->data['default_localization'] ?? new NullLocalization();
                                                 <?php endforeach; ?>
                                             </select>
                                         </div>
-                                        <div class="ipt-second"><input type="submit" name="loadDefaultLocalization" formaction="<?= UriFactory::build('{/api}profile/settings/localization?load=1'); ?>" value="<?= $this->getHtml('Load'); ?>"></div>
+                                        <div class="ipt-second"><input type="submit" name="loadDefaultLocalization" formaction="<?= UriFactory::build('{/api}profile/settings/localization?load=1&csrf={$CSRF}'); ?>" value="<?= $this->getHtml('Load'); ?>"></div>
                                     </div>
                                 </div>
 
@@ -759,7 +759,7 @@ $l11n = $this->data['default_localization'] ?? new NullLocalization();
                                             {"key": 1, "type": "event.prevent"},
                                             {"key": 2, "type": "dom.click", "selector": "#iLoginImageUpload"}
                                         ]}]'><?= $this->getHtml('Change'); ?></a>
-                                        <form id="iLoginImageUploadForm" action="<?= UriFactory::build('{/api}admin/settings/design'); ?>" method="post">
+                                        <form id="iLoginImageUploadForm" action="<?= UriFactory::build('{/api}admin/settings/design?csrf={$CSRF}'); ?>" method="post">
                                             <input class="preview" data-action='[
                                                 {"listener": "change", "key": 1, "action": [
                                                     {"key": 1, "type": "form.submit", "selector": "#iLoginImageUploadForm"}
diff --git a/tests/Controller/Api/ApiControllerModuleTrait.php b/tests/Controller/Api/ApiControllerModuleTrait.php
index d59c055..489369a 100755
--- a/tests/Controller/Api/ApiControllerModuleTrait.php
+++ b/tests/Controller/Api/ApiControllerModuleTrait.php
@@ -69,7 +69,7 @@ trait ApiControllerModuleTrait
         $this->module->apiModuleStatusUpdate($request, $response);
 
         self::assertEquals(RequestStatusCode::R_403, $response->header->status);
-        self::assertNull($response->getData('module_stutus_update'));
+        self::assertNull($response->getData('module_status_update'));
     }
 
     /**