diff --git a/system/lan/english.json b/system/lan/english.json
index 451a8d4f..9865a3b2 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -484,7 +484,6 @@
     "Current_Cycle": "Current Cycle",
     "Additional_Cost": "Additional Cost",
     "Remaining": "Remaining",
-    "": "",
     "Not_Found": "Not Found",
     "Cash": "Cash",
     "Payment_not_found": "Payment not found",
@@ -492,19 +491,13 @@
     "Cache_cleared_successfully_": "Cache cleared successfully!",
     "Paid": "Paid",
     "Send_Message": "Send Message",
-    "Send_SMS_WA_Message": "Send SMS\/WA Message",
-    "Send_Bulk_SMS_WA_Message": "Send Bulk SMS\/WA Message",
     "Send_Personal_Message": "Send Personal Message",
     "Send_Via": "Send Via",
     "Compose_your_message___": "Compose your message...",
     "Use_placeholders_": "Use placeholders:",
-    "__name__": "[[name]]",
     "Customer_Name": "Customer Name",
-    "__user_name__": "[[user_name]]",
     "Customer_Username": "Customer Username",
-    "__phone__": "[[phone]]",
     "Customer_Phone": "Customer Phone",
-    "__company_name__": "[[company_name]]",
     "Your_Company_Name": "Your Company Name",
     "Message_Sent_Successfully": "Message Sent Successfully",
     "Send_Bulk_Message": "Send Bulk Message",
@@ -518,8 +511,9 @@
     "Account_Type": "Account Type",
     "Coordinates": "Coordinates",
     "Latitude_and_Longitude_coordinates_for_map_must_be_separate_with_comma____": "Latitude and Longitude coordinates for map must be separate with comma ","",
-    "6_465422__3_406448": "6.465422, 3.406448",
     "Customer_Geo_Location_Information": "Customer Geo Location Information",
     "List": "List",
-    "Lists": "Lists"
+    "Lists": "Lists",
+    "Single_Customer": "Single Customer",
+    "Bulk_Customers": "Bulk Customers"
 }
\ No newline at end of file
diff --git a/ui/compiled/index.html b/ui/compiled/index.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/ui/hotspot.tpl b/ui/ui/hotspot.tpl
index ba6fa350..d79204f3 100644
--- a/ui/ui/hotspot.tpl
+++ b/ui/ui/hotspot.tpl
@@ -27,8 +27,8 @@
                         </form>
                     </div>
                     <div class="col-md-4">
-                        <a href="{$_url}services/add" class="btn btn-primary btn-block"><i
-                                class="ion ion-android-add"> </i> {Lang::T('New Service Plan')}</a>
+                        <a href="{$_url}services/add" class="btn btn-primary btn-block"><i class="ion ion-android-add">
+                            </i> {Lang::T('New Service Plan')}</a>
                     </div>&nbsp;
                 </div>
                 <div class="table-responsive">
@@ -50,11 +50,10 @@
                         </thead>
                         <tbody>
                             {foreach $d as $ds}
-                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"
-                                {elseif $ds['prepaid'] != 'yes'}class="warning" title="Postpaid" {/if}>
+                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"{/if}>
                                     <td class="headcol">{$ds['name_plan']}</td>
-                                    <td>{$ds['plan_type']}</td>
-                                     <td>{$ds['typebp']}</td>
+                                <td>{$ds['plan_type']} {if $ds['prepaid'] != 'yes'}<b>Postpaid</b>{else}Prepaid{/if}</td>
+                                    <td>{$ds['typebp']}</td>
                                     <td>{$ds['name_bw']}</td>
                                     <td>{Lang::moneyFormat($ds['price'])}</td>
                                     <td>{$ds['time_limit']} {$ds['time_unit']}</td>
@@ -69,7 +68,10 @@
                                             {/if}
                                         {/if}
                                     </td>
-                                    <td>{$ds['pool_expired']}{if $ds['list_expired']}{if $ds['pool_expired']} | {/if}{$ds['list_expired']}{/if}</td>
+                                    <td>{$ds['pool_expired']}{if $ds['list_expired']}
+                                        {if $ds['pool_expired']} |
+                                            {/if}{$ds['list_expired']}
+                                        {/if}</td>
                                     <td>
                                         <a href="{$_url}services/edit/{$ds['id']}"
                                             class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
diff --git a/ui/ui/pppoe.tpl b/ui/ui/pppoe.tpl
index 86d7a55f..41c242c7 100644
--- a/ui/ui/pppoe.tpl
+++ b/ui/ui/pppoe.tpl
@@ -36,7 +36,7 @@
                         <thead>
                             <tr>
                                 <th>{Lang::T('Plan Name')}</th>
-                                  <th>{Lang::T('Plan Type')}</th>
+                                <th>{Lang::T('Plan Type')}</th>
                                 <th>{Lang::T('Bandwidth Plans')}</th>
                                 <th>{Lang::T('Plan Price')}</th>
                                 <th>{Lang::T('Plan Validity')}</th>
@@ -49,23 +49,26 @@
                         </thead>
                         <tbody>
                             {foreach $d as $ds}
-                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"
-                                    {elseif $ds['prepaid'] != 'yes'}class="warning" title="Postpaid" {/if}>
+                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"{/if}>
                                     <td>{$ds['name_plan']}</td>
-                                     <td>{$ds['plan_type']}</td>
+                                    <td>{$ds['plan_type']} {if $ds['prepaid'] != 'yes'}<b>Postpaid</b>{else}Prepaid{/if}</td>
                                     <td>{$ds['name_bw']}</td>
                                     <td>{Lang::moneyFormat($ds['price'])}</td>
                                     <td>{$ds['validity']} {$ds['validity_unit']}</td>
                                     <td>{$ds['pool']}</td>
-                                    <td>{$ds['pool_expired']}{if $ds['list_expired']}{if $ds['pool_expired']} | {/if}{$ds['list_expired']}{/if}</td>
+                                    <td>{$ds['pool_expired']}{if $ds['list_expired']}
+                                        {if $ds['pool_expired']} |
+                                            {/if}{$ds['list_expired']}
+                                        {/if}</td>
                                     <td>
-                                    {if $ds['is_radius']}
-                                        <span class="label label-primary">RADIUS</span>
-                                    {else}
-                                        {if $ds['routers']!=''}
-                                            <a href="{$_url}routers/edit/0&name={$ds['routers']}">{$ds['routers']}</a>
+                                        {if $ds['is_radius']}
+                                            <span class="label label-primary">RADIUS</span>
+                                        {else}
+                                            {if $ds['routers']!=''}
+                                                <a href="{$_url}routers/edit/0&name={$ds['routers']}">{$ds['routers']}</a>
+                                            {/if}
                                         {/if}
-                                    {/if}</td>
+                                    </td>
                                     <td>
                                         <a href="{$_url}services/pppoe-edit/{$ds['id']}"
                                             class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl
index 6ca248a5..52bc5ba0 100644
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@@ -252,9 +252,9 @@
                         </a>
                         <ul class="treeview-menu">
                             <li {if $_routes[1] eq 'send' }class="active" {/if}><a
-                                    href="{$_url}message/send">{Lang::T('Send SMS/WA Message')}</a></li>
+                                    href="{$_url}message/send">{Lang::T('Single Customer')}</a></li>
                             <li {if $_routes[1] eq 'send_bulk' }class="active" {/if}><a
-                                    href="{$_url}message/send_bulk">{Lang::T('Send Bulk SMS/WA Message')}</a></li>
+                                    href="{$_url}message/send_bulk">{Lang::T('Bulk Customers')}</a></li>
                             {$_MENU_MESSAGE}
                         </ul>
                     </li>