diff --git a/cp/app/Controllers/SystemController.php b/cp/app/Controllers/SystemController.php
index 2045a83..74649c7 100644
--- a/cp/app/Controllers/SystemController.php
+++ b/cp/app/Controllers/SystemController.php
@@ -1784,21 +1784,21 @@ class SystemController extends Controller
                     $idntable = '/^(?!-)(?!.*--)[A-Z0-9-]{1,63}(?<!-)(.(?!-)(?!.*--)[A-Z0-9-]{1,63}(?<!-))*$/i';
                     $metadata = [
                         'Registry'      => $company_name,
-                        'Script'        => 'ASCII',
+                        'Script'        => 'latn',
                         'Version'       => '1.0',
                         'Effective Date'=> date('Y-m-d'),
                         'Contact'       => $email,
                         'Address'       => $address . ', ' . $address2 . ', ' . $cc,
                         'Telephone'     => $phone,
                         'Website'       => 'www.example.com',
-                        'Notes'         => 'This table describes codepoints allowed for the ASCII script.'
+                        'Notes'         => 'This table describes codepoints allowed for the Latin script.'
                     ];
                     break;
                 case 'cyrillic':
                     $idntable = '/^[а-яА-ЯґҐєЄіІїЇѝЍћЋљЈ0-9ʼѫѣѭ]+$/u';
                     $metadata = [
                         'Registry'      => $company_name,
-                        'Script'        => 'Cyrillic',
+                        'Script'        => 'cyrl',
                         'Version'       => '1.0',
                         'Effective Date'=> date('Y-m-d'),
                         'Contact'       => $email,
@@ -1812,7 +1812,7 @@ class SystemController extends Controller
                     $idntable = '/^[ぁ-んァ-ン一-龯々0-9]+$/u';
                     $metadata = [
                         'Registry'      => $company_name,
-                        'Script'        => 'Japanese',
+                        'Script'        => 'jpan',
                         'Version'       => '1.0',
                         'Effective Date'=> date('Y-m-d'),
                         'Contact'       => $email,
@@ -1826,7 +1826,7 @@ class SystemController extends Controller
                     $idntable = '/^[가-힣0-9]+$/u';
                     $metadata = [
                         'Registry'      => $company_name,
-                        'Script'        => 'Korean',
+                        'Script'        => 'kore',
                         'Version'       => '1.0',
                         'Effective Date'=> date('Y-m-d'),
                         'Contact'       => $email,
@@ -1840,7 +1840,7 @@ class SystemController extends Controller
                     $idntable = '/^(?!-)(?!.*--)[\x{0621}-\x{064A}\x{0660}-\x{0669}\x{0671}-\x{06D3}-]{1,63}(?<!-)$/u';
                     $metadata = [
                         'Registry'      => $company_name,
-                        'Script'        => 'Arabic',
+                        'Script'        => 'arab',
                         'Version'       => '1.0',
                         'Effective Date'=> date('Y-m-d'),
                         'Contact'       => $email,
@@ -1854,14 +1854,14 @@ class SystemController extends Controller
                     $idntable = '/^(?!-)(?!.*--)[A-Z0-9-]{1,63}(?<!-)(.(?!-)(?!.*--)[A-Z0-9-]{1,63}(?<!-))*$/i';
                     $metadata = [
                         'Registry'      => $company_name,
-                        'Script'        => 'ASCII (default)',
+                        'Script'        => 'latn',
                         'Version'       => '1.0',
                         'Effective Date'=> date('Y-m-d'),
                         'Contact'       => $email,
                         'Address'       => $address . ', ' . $address2 . ', ' . $cc,
                         'Telephone'     => $phone,
                         'Website'       => 'www.example.com',
-                        'Notes'         => 'This table describes codepoints allowed for the ASCII script (default).'
+                        'Notes'         => 'This table describes codepoints allowed for the Latin script.'
                     ];
                     break;
             }
diff --git a/cp/resources/views/admin/system/listTlds.twig b/cp/resources/views/admin/system/listTlds.twig
index c58e7a8..28cb36d 100644
--- a/cp/resources/views/admin/system/listTlds.twig
+++ b/cp/resources/views/admin/system/listTlds.twig
@@ -20,13 +20,6 @@
               <!-- Page title actions -->
               <div class="col-auto ms-auto d-print-none">
                 <div class="btn-list">
-                  <a href="{{route('manageReserved')}}" class="btn btn-outline-secondary d-none d-sm-inline-block">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M9 6l11 0" /><path d="M9 12l11 0" /><path d="M9 18l11 0" /><path d="M5 6l0 .01" /><path d="M5 12l0 .01" /><path d="M5 18l0 .01" /></svg>
-                    {{ __('Reserved Names') }}
-                  </a>
-                  <a href="{{route('manageReserved')}}" class="btn btn-outline-secondary d-sm-none btn-icon" title="{{ __('Reserved Names') }}" aria-label="{{ __('Reserved Names') }}">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M9 6l11 0" /><path d="M9 12l11 0" /><path d="M9 18l11 0" /><path d="M5 6l0 .01" /><path d="M5 12l0 .01" /><path d="M5 18l0 .01" /></svg>
-                  </a>
                   <a href="{{route('manageTokens')}}" class="btn btn-outline-dark d-none d-sm-inline-block">
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M12 12l8 -4.5" /><path d="M12 12v9" /><path d="M12 12l-8 -4.5" /><path d="M12 12l8 4.5" /><path d="M12 3v9" /><path d="M12 12l-8 4.5" /></svg>
                     {{ __('Allocation Tokens') }}
@@ -34,6 +27,13 @@
                   <a href="{{route('manageTokens')}}" class="btn btn-outline-dark d-sm-none btn-icon" title="{{ __('Allocation Tokens') }}" aria-label="{{ __('Allocation Tokens') }}">
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M12 12l8 -4.5" /><path d="M12 12v9" /><path d="M12 12l-8 -4.5" /><path d="M12 12l8 4.5" /><path d="M12 3v9" /><path d="M12 12l-8 4.5" /></svg>
                   </a>
+                  <a href="{{route('manageReserved')}}" class="btn btn-secondary d-none d-sm-inline-block">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M9 6l11 0" /><path d="M9 12l11 0" /><path d="M9 18l11 0" /><path d="M5 6l0 .01" /><path d="M5 12l0 .01" /><path d="M5 18l0 .01" /></svg>
+                    {{ __('Reserved Names') }}
+                  </a>
+                  <a href="{{route('manageReserved')}}" class="btn btn-secondary d-sm-none btn-icon" title="{{ __('Reserved Names') }}" aria-label="{{ __('Reserved Names') }}">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M9 6l11 0" /><path d="M9 12l11 0" /><path d="M9 18l11 0" /><path d="M5 6l0 .01" /><path d="M5 12l0 .01" /><path d="M5 18l0 .01" /></svg>
+                  </a>
                   <a href="{{route('createTld')}}" class="btn btn-primary d-none d-sm-inline-block">
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><line x1="12" y1="5" x2="12" y2="19" /><line x1="5" y1="12" x2="19" y2="12" /></svg>
                     {{ __('Create New TLD') }}
diff --git a/cp/resources/views/admin/system/updateToken.twig b/cp/resources/views/admin/system/updateToken.twig
index 6c4cead..5a6e7a5 100644
--- a/cp/resources/views/admin/system/updateToken.twig
+++ b/cp/resources/views/admin/system/updateToken.twig
@@ -30,7 +30,7 @@
                   <div class="datagrid">
                     <div class="datagrid-item">
                       <div class="datagrid-title">{{ __('Token') }}</div>
-                      <div class="datagrid-content">{{ token.token }}</div>
+                      <div class="datagrid-content user-select-all">{{ token.token }}</div>
                     </div>
                     <div class="datagrid-item">
                       <div class="datagrid-title">{{ __('Creation Date') }}</div>