diff --git a/ui/theme/default/bandwidth-add.tpl b/ui/theme/default/bandwidth-add.tpl
index 6e3b9df..ed6cb35 100755
--- a/ui/theme/default/bandwidth-add.tpl
+++ b/ui/theme/default/bandwidth-add.tpl
@@ -48,7 +48,7 @@
 
 					<div class="form-group">
 						<div class="col-lg-offset-2 col-lg-10" style="display:flex;justify-content:space-between;align-items:center;">
-							<button class="btn btn-primary waves-effect waves-light" type="submit">{$_L['Submit']}</button><a href="{$_url}bandwidth/list">{$_L['Cancel']}</a>
+							<button class="btn btn-primary waves-effect waves-light" type="submit" onclick="myBtn()">{$_L['Submit']}</button><a href="{$_url}bandwidth/list">{$_L['Cancel']}</a>
 						</div>
 					</div>
                 </form>
@@ -59,5 +59,10 @@
 				</div>
 			</div>
 		</div>
+<script>
+function myBtn() {
+  location.replace("{$_url}bandwidth/list")
+}
+</script>
 
 {include file="sections/darkmode.tpl"}
diff --git a/ui/theme/default/bandwidth-edit.tpl b/ui/theme/default/bandwidth-edit.tpl
index 4e9e55c..8a69ece 100755
--- a/ui/theme/default/bandwidth-edit.tpl
+++ b/ui/theme/default/bandwidth-edit.tpl
@@ -49,7 +49,7 @@
 					
 					<div class="form-group">
 						<div class="col-lg-offset-2 col-lg-10" style="display:flex;justify-content:space-between;align-items:center;">
-							<button class="btn btn-primary waves-effect waves-light" type="submit">{$_L['Submit']}</button><a href="{$_url}bandwidth/list">{$_L['Cancel']}</a>
+							<button class="btn btn-primary waves-effect waves-light" type="submit" onclick="myBtn()">{$_L['Submit']}</button><a href="{$_url}bandwidth/list">{$_L['Cancel']}</a>
 						</div>
 					</div>
                 </form>
@@ -60,5 +60,10 @@
 					</div>
 				</div>
 			</div>
+<script>
+function myBtn() {
+  location.replace("{$_url}bandwidth/list")
+}
+</script>
 
 {include file="sections/footer.tpl"}
diff --git a/ui/theme/default/customers-add.tpl b/ui/theme/default/customers-add.tpl
index 41135aa..e40651e 100755
--- a/ui/theme/default/customers-add.tpl
+++ b/ui/theme/default/customers-add.tpl
@@ -41,8 +41,8 @@
 							</ion-item>
 										
 							<div class="form-group">
-								<div class="col-md-12">
-									<button class="btn btn-primary waves-effect waves-light" type="submit">{$_L['Save']}</button>
+								<div class="col-md-12 flex">
+									<button class="btn btn-primary waves-effect waves-light" type="submit" onclick="myBtn()">{$_L['Save']}</button> <a href="{$_url}customers/list">{$_L['Cancel']}</a>
 								</div>
 							</div>
 						</form>
@@ -51,6 +51,10 @@
 				</ion-card>
 			</div>
 		</div>
-		
-</ion-content>
+<script>
+function myBtn() {
+  location.replace("{$_url}customers/list")
+}
+</script>
+
 {include file="sections/footer.tpl"}
diff --git a/ui/theme/default/customers-edit.tpl b/ui/theme/default/customers-edit.tpl
index 6264d6a..8a6ccf7 100755
--- a/ui/theme/default/customers-edit.tpl
+++ b/ui/theme/default/customers-edit.tpl
@@ -42,8 +42,8 @@
 							</ion-item>
 
 								<div class="form-group">
-									<div class="col-lg-offset-2 col-lg-10 flex">
-										<button class="btn btn-primary waves-effect waves-light" type="submit">{$_L['Save']}</button> <a href="{$_url}customers/list">{$_L['Cancel']}</a>
+									<div class="col-md-12 flex">
+										<button class="btn btn-primary waves-effect waves-light" type="submit" onclick="myBtn()">{$_L['Save']}</button> <a href="{$_url}customers/list">{$_L['Cancel']}</a>
 									</div>
 								</div>
 							</form>
@@ -51,5 +51,9 @@
 					</ion-card>
 				</div>
 			</div>
-</ion-content>
+<script>
+function myBtn() {
+  location.replace("{$_url}customers/list")
+}
+</script>
 {include file="sections/footer.tpl"}
diff --git a/ui/theme/default/default.zip b/ui/theme/default/default.zip
deleted file mode 100644
index 11a78aa..0000000
Binary files a/ui/theme/default/default.zip and /dev/null differ
diff --git a/ui/theme/default/hotspot-add.tpl b/ui/theme/default/hotspot-add.tpl
index a408ae4..d4ff9b8 100755
--- a/ui/theme/default/hotspot-add.tpl
+++ b/ui/theme/default/hotspot-add.tpl
@@ -118,7 +118,7 @@
 					
 					<div class="form-group">
 						<div class="col-lg-offset-2 col-lg-10 flex">
-							<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Save']}</button><a href="{$_url}services/hotspot">{$_L['Cancel']}</a>
+							<button class="btn btn-success waves-effect waves-light" type="submit" onclick="myBtn()">{$_L['Save']}</button><a href="{$_url}services/hotspot">{$_L['Cancel']}</a>
 						</div>
 					</div>
                 </form>
@@ -127,5 +127,10 @@
 				</div>
 			</div>
 		</div>
+<script>
+function myBtn() {
+  location.replace("{$_url}services/hotspot")
+}
+</script>
 
 {include file="sections/footer.tpl"}
diff --git a/ui/theme/default/hotspot-edit.tpl b/ui/theme/default/hotspot-edit.tpl
index f19bc86..c597c3f 100755
--- a/ui/theme/default/hotspot-edit.tpl
+++ b/ui/theme/default/hotspot-edit.tpl
@@ -115,7 +115,7 @@
 							
 							<div class="form-group">
 								<div class="col-lg-offset-2 col-lg-10 flex">
-									<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Save']}</button><a href="{$_url}services/hotspot">{$_L['Cancel']}</a>
+									<button class="btn btn-success waves-effect waves-light" type="submit" onclick="myBtn()">{$_L['Save']}</button><a href="{$_url}services/hotspot">{$_L['Cancel']}</a>
 								</div>
 							</div>
 						</form>
@@ -124,5 +124,10 @@
 				</div>
 			</div>
 		</div>
+<script>
+function myBtn() {
+  location.replace("{$_url}services/hotspot")
+}
+</script>
 
 {include file="sections/footer.tpl"}
diff --git a/ui/theme/default/prepaid-edit.tpl b/ui/theme/default/prepaid-edit.tpl
index 3ccb818..b1c2810 100755
--- a/ui/theme/default/prepaid-edit.tpl
+++ b/ui/theme/default/prepaid-edit.tpl
@@ -1,22 +1,30 @@
 {include file="sections/header.tpl"}
+      <ion-header translucent>
+        <ion-toolbar>
+        <ion-buttons slot="start">
+          <ion-button onclick="history.back()"><ion-icon name="arrow-back-outline"></ion-icon></ion-button>
+        </ion-buttons>
+          <ion-title>{$_L['Recharge_Account']}</ion-title>
+        </ion-toolbar>
+      </ion-header>
 
-<div class="row">
-    <div class="col-sm-12">
-        <div class="panel panel-default">
-            <div class="panel-heading"><h3 class="panel-title">{$_L['Recharge_Account']}</h3></div>
-            <div class="panel-body">
+          <ion-content fullscreen class="ion-padding">
+
+		<div class="row">
+			<div class="m-lr">
+				<ion-card class="panel panel-default panel-hovered panel-stacked mb30"><ion-card-content>
                 <form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/edit-post">
 				<input type="hidden" name="id" value="{$d['id']}">
                     <div class="form-group">
 						<label class="col-md-2 control-label">{$_L['Select_Account']}</label>
-						<div class="col-md-6">
+						<div class="col-md-10">
 							<input type="text" class="form-control" id="username" name="username" value="{$d['username']}" readonly>
 						</div>
                     </div>
 
                     <div class="form-group">
 						<label class="col-md-2 control-label">{$_L['Service_Plan']}</label>
-						<div class="col-md-6">
+						<div class="col-md-10">
 							<select id="id_plan" name="id_plan" class="form-control">
                                 {foreach $p as $ps}
 									<option value="{$ps['id']}" {if $d['plan_id'] eq $ps['id']} selected {/if}>{$ps['name_plan']}</option>
@@ -27,7 +35,7 @@
 					
                     <div class="form-group">
 						<label class="col-md-2 control-label">{$_L['Created_On']}</label>
-						<div class="col-md-6">
+						<div class="col-md-10">
 							<div class="input-group date" id="datepicker1">
 								<input type="text" class="form-control" id="recharged_on" name="recharged_on" value="{$d['recharged_on']}">
 								<span class="input-group-addon ion ion-calendar"></span>
@@ -36,7 +44,7 @@
                     </div>
                     <div class="form-group">
 						<label class="col-md-2 control-label">{$_L['Expires_On']}</label>
-						<div class="col-md-6">
+						<div class="col-md-10">
 							<div class="input-group date" id="datepicker2">
 								<input type="text" class="form-control" id="expiration" name="expiration" value="{$d['expiration']}">
 								<span class="input-group-addon ion ion-calendar"></span>
@@ -45,15 +53,21 @@
                     </div>
 					
 					<div class="form-group">
-						<div class="col-lg-offset-2 col-lg-10">
-							<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Edit']}</button> 
-							Or <a href="{$_url}prepaid/list">{$_L['Cancel']}</a>
+						<div class="col-lg-offset-2 col-lg-10 flex">
+							<button class="btn btn-success waves-effect waves-light" type="submit" onclick="myBtn()">{$_L['Edit']}</button> <a href="{$_url}prepaid/list">{$_L['Cancel']}</a>
 						</div>
 					</div>
                 </form>
+                    </ion-card-content>
+				</ion-card>
             </div>
         </div>
     </div>
 </div>
+<script>
+function myBtn() {
+  location.replace("{$_url}prepaid/list")
+}
+</script>
 
 {include file="sections/footer.tpl"}
diff --git a/ui/theme/default/users-edit.tpl b/ui/theme/default/users-edit.tpl
index 9f195fb..08d27b3 100755
--- a/ui/theme/default/users-edit.tpl
+++ b/ui/theme/default/users-edit.tpl
@@ -55,15 +55,20 @@
 
 					<div class="form-group">
 						<div class="col-lg-offset-2 col-lg-10 flex">
-							<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Save']}</button><a href="{$_url}settings/users">{$_L['Cancel']}</a>
+							<button class="btn btn-success waves-effect waves-light" type="submit" onclick="myFunc()">{$_L['Save']}</button><a href="{$_url}settings/users">{$_L['Cancel']}</a>
 						</div>
 					</div>
-                    </ion-card-content>
                 </form>
-				
+                    </ion-card-content>
+				</ion-card>
 					</div>
 				</div>
 			</div>
 		</div>
+<script>
+function myFunc() {
+  location.replace("{$_url}settings/users")
+}
+</script>
 
 {include file="sections/footer.tpl"}
diff --git a/ui/theme/default/voucher-add.tpl b/ui/theme/default/voucher-add.tpl
index 930b885..8fd2b87 100755
--- a/ui/theme/default/voucher-add.tpl
+++ b/ui/theme/default/voucher-add.tpl
@@ -57,7 +57,7 @@
 					
 					<div class="form-group">
 						<div class="col-lg-offset-2 col-lg-10">
-							<button class="btn btn-success waves-effect waves-light" type="submit" style="float:right">{$_L['Generate']}</button> 
+							<button class="btn btn-success waves-effect waves-light" type="submit" onclick="myBtn()" style="float:right">{$_L['Generate']}</button> 
 						</div>
 					</div>
                 </form>
@@ -66,5 +66,10 @@
     </ion-card>
 			</div>
 		</div>
+<script>
+function myBtn() {
+  location.replace("{$_url}prepaid/voucher")
+}
+</script>
 
 {include file="sections/footer.tpl"}
diff --git a/ui/theme/default/voucher.tpl b/ui/theme/default/voucher.tpl
index f8d144a..922ce24 100755
--- a/ui/theme/default/voucher.tpl
+++ b/ui/theme/default/voucher.tpl
@@ -58,7 +58,9 @@
 									<td align="center">{if $ds['status'] eq '0'} <label class="btn-tag btn-tag-success">Not Use</label> {else} <label class="btn-tag btn-tag-danger">Used</label> {/if}</td>
 									<td align="center">{if $ds['user'] eq '0'} - {else} {$ds['user']} {/if}</td>
 									<td>
-										<a href="{$_url}prepaid/voucher-delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-sm cdelete">{$_L['Delete']}</a>
+        <ion-buttons>
+          <ion-button href="{$_url}prepaid/voucher-delete/{$ds['id']}" id="{$ds['id']}" class="cdelete"><ion-icon name="trash" color="danger" slot="start"></ion-icon><ion-label>{$_L['Delete']}</ion-label></ion-button>
+        </ion-buttons>
 									</td>
 								</tr>
 							{/foreach}