diff --git a/ui/ui/paymentgateway.tpl b/ui/ui/paymentgateway.tpl
index 5fdf1150..14297297 100644
--- a/ui/ui/paymentgateway.tpl
+++ b/ui/ui/paymentgateway.tpl
@@ -10,10 +10,10 @@
                             {foreach $pgs as $pg}
                                 <tr>
                                     <td width="10" align="center" valign="center"><input type="checkbox" name="pgs[]"
-                            {if in_array($pg, $actives)}checked{/if}
-                                            value="{$pg}"></td>
+                                            {if in_array($pg, $actives)}checked{/if} value="{$pg}"></td>
                                     <td><a href="{$_url}paymentgateway/{$pg}"
-                                            class="btn btn-block btn-{if in_array($pg, $actives)}info{else}default{/if} text-left">{ucwords($pg)}</a></td>
+                                            class="btn btn-block btn-{if in_array($pg, $actives)}info{else}default{/if} text-left">{ucwords($pg)}</a>
+                                    </td>
                                     <td width="10"><a href="{$_url}paymentgateway/delete/{$pg}"
                                             onclick="return confirm('{Lang::T('Delete')} {$pg}?')" class="btn btn-danger"><i
                                                 class="glyphicon glyphicon-trash"></i></a></td>
@@ -22,8 +22,8 @@
                         </tbody>
                     </table>
                 </div>
-                <div class="panel-footer"><button type="submit"
-                        class="btn btn-primary btn-block" name="save" value="actives">{Lang::T('Save Changes')}</button></div>
+                <div class="panel-footer"><button type="submit" class="btn btn-primary btn-block" name="save"
+                        value="actives">{Lang::T('Save Changes')}</button></div>
             </div>
         </div>
     </div>
diff --git a/ui/ui/user-dashboard.tpl b/ui/ui/user-dashboard.tpl
index f797accd..732f4414 100644
--- a/ui/ui/user-dashboard.tpl
+++ b/ui/ui/user-dashboard.tpl
@@ -53,10 +53,10 @@
                 <h3 class="box-title">{Lang::T('Announcement')}</h3>
             </div>
             <div class="box-body">
-            {$Announcement_Customer = "{$PAGES_PATH}/Announcement_Customer.html"}
-            {if file_exists($Announcement_Customer)}
-                {include file=$Announcement_Customer}
-            {/if}
+                {$Announcement_Customer = "{$PAGES_PATH}/Announcement_Customer.html"}
+                {if file_exists($Announcement_Customer)}
+                    {include file=$Announcement_Customer}
+                {/if}
             </div>
         </div>
     </div>
@@ -131,11 +131,8 @@
                             <td class="small text-primary text-uppercase text-normal">{Lang::T('Plan Name')}</td>
                             <td class="small mb15">
                                 {$_bill['namebp']}
-                                {if $_bill['status'] == 'on'}
-                                    <a class="label label-danger pull-right" href="{$_url}home&deactivate={$_bill['id']}"
-                                        onclick="return confirm('{Lang::T('Deactivate')}?')">{Lang::T('Deactivate')}</a>
-                                {else}
-                                    <a class="label label-warning pull-right" href="{$_url}order/package">{Lang::T('expired')}</a>
+                                {if $_bill['status'] != 'on'}
+                                    <a class="label label-danger pull-right" href="{$_url}order/package">{Lang::T('expired')}</a>
                                 {/if}
                             </td>
                         </tr>
@@ -149,8 +146,6 @@
                             <td class="small text-danger text-uppercase text-normal">{Lang::T('Expires On')}</td>
                             <td class="small mb15 text-danger">
                                 {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['expiration'],$_bill['time'])}{/if}&nbsp;
-                                <a class="label label-primary pull-right" href="{$_url}home&recharge={$_bill['id']}"
-                                    onclick="return confirm('{Lang::T('Recharge')}?')">{Lang::T('Recharge')}</a>
                             </td>
                         </tr>
                         {if $nux_ip}
@@ -173,6 +168,18 @@
                                 </td>
                             </tr>
                         {/if}
+                        <tr>
+                            <td class="small text-primary text-uppercase text-normal">
+                                {if $_bill['status'] == 'on'}
+                                    <a href="{$_url}home&deactivate={$_bill['id']}" onclick="return confirm('{Lang::T('Deactivate')}?')"
+                                        class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
+                                {/if}
+                            </td>
+                            <td class="small row">
+                                <a class="btn btn-primary pull-right  btn-sm" href="{$_url}home&recharge={$_bill['id']}"
+                                    onclick="return confirm('{Lang::T('Recharge')}?')">{Lang::T('Recharge')}</a>
+                            </td>
+                        </tr>
                     </table>
                 {/foreach}
             </div>