diff --git a/ui/ui/admin-add.tpl b/ui/ui/admin-add.tpl
index 5ee3e647..edd26814 100644
--- a/ui/ui/admin-add.tpl
+++ b/ui/ui/admin-add.tpl
@@ -89,7 +89,7 @@
                         <label class="col-md-5 control-label">{Lang::T('Send Notification')}</label>
                         <div class="col-md-7">
                             <select name="send_notif" id="send_notif" class="form-control">
-                                <option value="-">{Lang::T('Don't Send')}</option>
+                                <option value="-">{Lang::T("Don't Send")}</option>
                                 <option value="sms">{Lang::T('By SMS')}</option>
                                 <option value="wa">{Lang::T('By WhatsApp')}</option>
                             </select>
diff --git a/ui/ui/user-ui/header.tpl b/ui/ui/user-ui/header.tpl
index c0aead33..f57da6bc 100644
--- a/ui/ui/user-ui/header.tpl
+++ b/ui/ui/user-ui/header.tpl
@@ -422,7 +422,7 @@
                         <li {if $_system_menu eq 'voucher'}class="active" {/if}>
                             <a href="{$_url}voucher/activation">
                                 <i class="fa fa-ticket"></i>
-                                <span>{Lang::T('Voucher')}</span>
+                                <span>Voucher</span>
                             </a>
                         </li>
                     {/if}
@@ -485,4 +485,4 @@
                             }
                         });
                     </script>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/ui/ui/user-ui/orderBalance.tpl b/ui/ui/user-ui/orderBalance.tpl
index d68316ae..ce5ecfe2 100644
--- a/ui/ui/user-ui/orderBalance.tpl
+++ b/ui/ui/user-ui/orderBalance.tpl
@@ -4,7 +4,7 @@
     <div class="col-sm-12">
         {if $_c['enable_balance'] == 'yes'}
             <div class="box box-solid box-success bg-gray-light">
-                <div class="box-header">{Lang::T('Balance Plans')}</div>
+                <div class="box-header">{Lang::T('Buy Balance Plans')}</div>
                 <div class="box-body row">
                     {foreach $plans_balance as $plan}
                         <div class="col col-md-4">
diff --git a/ui/ui/user-ui/orderHistory.tpl b/ui/ui/user-ui/orderHistory.tpl
index 3f60a74c..bee69cf4 100644
--- a/ui/ui/user-ui/orderHistory.tpl
+++ b/ui/ui/user-ui/orderHistory.tpl
@@ -11,14 +11,14 @@
                         <thead>
                             <tr>
                                 <th>{Lang::T('Plan Name')}</th>
-                                <th>{Lang::T('Gateway')}</th>
-                                <th>{Lang::T('Routers')}</th>
+                                <th>{Lang::T('Payment Method')}</th>
+                                <th>Routers</th>
                                 <th>{Lang::T('Type')}</th>
                                 <th>{Lang::T('Plan Price')}</th>
-                                <th>{Lang::T('Created On')}</th>
-                                <th>{Lang::T('Expires On')}</th>
-                                <th>{Lang::T('Date Done')}</th>
-                                <th>{Lang::T('Method')}</th>
+                                <th>{Lang::T('Created on')}</th>
+                                <th>{Lang::T('Expires on')}</th>
+                                <th>{Lang::T('Date')}</th>
+                                <th>{Lang::T('Status')}</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -53,4 +53,4 @@
 </div>
 
 
-{include file="user-ui/footer.tpl"}
\ No newline at end of file
+{include file="user-ui/footer.tpl"}
diff --git a/ui/ui/user-ui/orderView.tpl b/ui/ui/user-ui/orderView.tpl
index 6f62ad76..a8d5ab1a 100644
--- a/ui/ui/user-ui/orderView.tpl
+++ b/ui/ui/user-ui/orderView.tpl
@@ -5,7 +5,7 @@
     <div class="col-md-6">
         <div
             class="panel mb20 {if $trx['status']==1}panel-warning{elseif $trx['status']==2}panel-success{elseif $trx['status']==3}panel-danger{elseif $trx['status']==4}panel-danger{else}panel-primary{/if} panel-hovered">
-            <div class="panel-footer">Transaction #{$trx['id']}</div>
+            <div class="panel-footer">{Lang::T('Transaction')} #{$trx['id']}</div>
             {if !in_array($trx['routers'],['balance','radius'])}
                 <div class="panel-body">
                     <div class="panel panel-primary panel-hovered">
@@ -120,7 +120,7 @@
                                     {/if}
                                 {/if}
                                 <tr>
-                                    <td>{Lang::T('Plan Validity')}</td>
+                                    <td>{Lang::T('Validity Periode')}</td>
                                     <td>{$plan['validity']} {$plan['validity_unit']}</td>
                                 </tr>
                                 <tr>
@@ -134,15 +134,15 @@
                 {/if}
             </div>
             {if $trx['status']==1}
-                <div class="panel-footer ">
+                <div class="panel-footer">
                     <div class="btn-group btn-group-justified">
                         <a href="{$trx['pg_url_payment']}" {if $trx['gateway']=='midtrans'} target="_blank" {/if}
-                            class="btn btn-primary">{Lang::T('PAY NOW')}</a>
+                            class="btn btn-primary">{Lang::T('Pay Now')}</a>
                         <a href="{$_url}order/view/{$trx['id']}/check"
                             class="btn btn-info">{Lang::T('Check for Payment')}</a>
                     </div>
                 </div>
-                <div class="panel-footer ">
+                <div class="panel-footer">
                     <a href="{$_url}order/view/{$trx['id']}/cancel" class="btn btn-danger"
                         onclick="return confirm('{Lang::T('Cancel it?')}')">{Lang::T('Cancel')}</a>
                 </div>
@@ -150,4 +150,4 @@
         </div>
     </div>
 </div>
-{include file="user-ui/footer.tpl"}
\ No newline at end of file
+{include file="user-ui/footer.tpl"}
diff --git a/ui/ui/user-ui/profile.tpl b/ui/ui/user-ui/profile.tpl
index e63402b5..311ba8e5 100644
--- a/ui/ui/user-ui/profile.tpl
+++ b/ui/ui/user-ui/profile.tpl
@@ -4,9 +4,8 @@
 <div class="row">
     <div class="col-sm-12 col-md-12">
         <div class="panel panel-primary panel-hovered panel-stacked mb30">
-            <div class="panel-heading">{Lang::T('Edit User')}</div>
+            <div class="panel-heading">{Lang::T('Data Change')}</div>
             <div class="panel-body">
-
                 <form class="form-horizontal" method="post" role="form" action="{$_url}accounts/edit-profile-post">
                     <input type="hidden" name="id" value="{$_user['id']}">
                     <div class="form-group">
@@ -21,7 +20,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Full Name')}</label>
+                        <label class="col-md-2 control-label">{Lang::T('Full name')}</label>
                         <div class="col-md-6">
                             <input type="text" class="form-control" id="fullname" name="fullname"
                                 value="{$_user['fullname']}">
@@ -36,25 +35,25 @@
                     </div>
                     {if $_c['allow_phone_otp'] != 'yes'}
                         <div class="form-group">
-                            <label class="col-md-2 control-label">{Lang::T('Phone Number')}</label>
+                            <label class="col-md-2 control-label">{Lang::T('Phone number')}</label>
                             <div class="col-md-6">
                                 <div class="input-group">
                                     <span class="input-group-addon" id="basic-addon1">+</span>
                                     <input type="text" class="form-control" name="phonenumber" id="phonenumber"
                                         value="{$_user['phonenumber']}"
-                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone number')}">
                                 </div>
                             </div>
                         </div>
                     {else}
                         <div class="form-group">
-                            <label class="col-md-2 control-label">{Lang::T('Phone Number')}</label>
+                            <label class="col-md-2 control-label">{Lang::T('Phone number')}</label>
                             <div class="col-md-6">
                                 <div class="input-group">
                                     <span class="input-group-addon" id="basic-addon1">+</span>
                                     <input type="text" class="form-control" name="phonenumber" id="phonenumber"
                                         value="{$_user['phonenumber']}" readonly
-                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone number')}">
                                     <span class="input-group-btn">
                                         <a href="{$_url}accounts/phone-update" type="button"
                                             class="btn btn-info btn-flat">{Lang::T('Change')}</a>
@@ -63,7 +62,6 @@
                             </div>
                         </div>
                     {/if}
-
                     {if $_c['allow_email_otp'] != 'yes'}
                         <div class="form-group">
                             <label class="col-md-2 control-label">{Lang::T('Email')}</label>
@@ -87,7 +85,6 @@
                             </div>
                         </div>
                     {/if}
-
                     <div class="form-group">
                         <div class="col-lg-offset-2 col-lg-10">
                             <button class="btn btn-success" type="submit">
@@ -96,10 +93,9 @@
                         </div>
                     </div>
                 </form>
-
             </div>
         </div>
     </div>
 </div>
 
-{include file="user-ui/footer.tpl"}
\ No newline at end of file
+{include file="user-ui/footer.tpl"}
diff --git a/ui/ui/user-ui/selectGateway.tpl b/ui/ui/user-ui/selectGateway.tpl
index aa61a529..1cf6a490 100644
--- a/ui/ui/user-ui/selectGateway.tpl
+++ b/ui/ui/user-ui/selectGateway.tpl
@@ -41,7 +41,7 @@
                     {/if}
                     <li class="list-group-item">
                         <b>{Lang::T('Type')}</b> <span class="pull-right">{if $plan['prepaid'] eq
-                            'yes'}Prepaid{else}Postpaid
+                            'yes'}{Lang::T('Prepaid')}{else}{Lang::T('Postpaid')}
                             {/if}
                             {$plan['type']}</span>
                     </li>
@@ -54,7 +54,7 @@
                     </li>
                     {if $plan['validity']}
                         <li class="list-group-item">
-                            <b>{Lang::T('Plan Validity')}</b> <span class="pull-right">{$plan['validity']}
+                            <b>{Lang::T('Validity Periode')}</b> <span class="pull-right">{$plan['validity']}
                                 {$plan['validity_unit']}</span>
                         </li>
                     {/if}
diff --git a/ui/ui/user-ui/sendPlan.tpl b/ui/ui/user-ui/sendPlan.tpl
index 601b35a5..2ae39b02 100644
--- a/ui/ui/user-ui/sendPlan.tpl
+++ b/ui/ui/user-ui/sendPlan.tpl
@@ -38,7 +38,7 @@
                                 {Lang::moneyFormat($plan['price'])}</td>
                         </tr>
                         <tr>
-                            <td>{Lang::T('Validity')}</td>
+                            <td>{Lang::T('Validity Periode')}</td>
                             <td>{$plan['validity']} {$plan['validity_unit']}</td>
                         </tr>
                     </tbody>
@@ -53,7 +53,7 @@
                         </div>
                         <div class="form-group col-sm-3" align="center">
                             <button class="btn btn-success btn-block" id="sendBtn" type="submit" name="send"
-                                onclick="return confirm('{Lang::T(" Are You Sure?")}')" value="plan"><i
+                                onclick="return confirm('{Lang::T("Are You Sure?")}')" value="plan"><i
                                     class="glyphicon glyphicon-send"></i></button>
                         </div>
                     </div>
@@ -64,4 +64,4 @@
         </div>
     </div>
 </div>
-{include file="user-ui/footer.tpl"}
\ No newline at end of file
+{include file="user-ui/footer.tpl"}