diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 4ffb1434..49aee280 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -453,7 +453,8 @@ class BookingController extends Controller
         if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
             $svcharge = 0;
         } else {
-            $svcharge = 20.00;
+            //$svcharge = 20.00;
+            $svcharge = 0; // UPDATE ON : 15-8-2018 from PM
         }
        
         $subtotal = round(($amount + $svcharge) / $rate, 2);
@@ -780,7 +781,8 @@ class BookingController extends Controller
          if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
              $svcharge = 0;
          } else {
-             $svcharge = 20.00;
+             //$svcharge = 20.00;
+             $svcharge = 0; // UPDATE ON : 15-8-2018 from PM
          }
         
          $subtotal = round(($amount + $svcharge) / $rate,2);
diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index eaf1b056..e4f1b0d1 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -1,5 +1,4 @@
 https://exchange-staging.izyim.com {
-    proxy /phpmyadmin  127.0.0.1:8090
     root /var/www/public
     
     fastcgi / 127.0.0.1:9000 php {
diff --git a/database/migrations/2018_08_15_154652_remove_foreight_from_setting_active_banks_table.php b/database/migrations/2018_08_15_154652_remove_foreight_from_setting_active_banks_table.php
new file mode 100644
index 00000000..d6ffe132
--- /dev/null
+++ b/database/migrations/2018_08_15_154652_remove_foreight_from_setting_active_banks_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveForeightFromSettingActiveBanksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('setting_active_banks', function (Blueprint $table) {
+            $table->dropForeign('setting_active_banks_beneficiary_id_foreign');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('setting_active_banks', function (Blueprint $table) {
+            //
+        });
+    }
+}
diff --git a/resources/assets/js/pages/settings/admin-bank-setting.vue b/resources/assets/js/pages/settings/admin-bank-setting.vue
index 7666ba77..c1e82cda 100644
--- a/resources/assets/js/pages/settings/admin-bank-setting.vue
+++ b/resources/assets/js/pages/settings/admin-bank-setting.vue
@@ -3,8 +3,7 @@
     <span align="center"><h4>Bank Setting</h4></span><br>
     <el-form :inline="true">
         <el-form-item>
-            Active CIEF bank account for today : 
-            X1 : 
+            Active Bank Account for X1: 
             <el-select v-model="active_bank_setting.x1_bank_id" size="mini">
                 <el-option
                   v-for="item in options_CIEF"
@@ -14,8 +13,9 @@
                 </el-option>
             </el-select>
         </el-form-item>
+        <br>
         <el-form-item>
-            X2 : 
+            Active Bank Account for X2 : 
             <el-select v-model="active_bank_setting.x2_bank_id" size="mini">
                 <el-option
                   v-for="item in options_CIEF"
@@ -26,7 +26,7 @@
             </el-select>
         </el-form-item>
         <el-form-item>
-            Active CIEF China Beneficiary Account for Today : 
+            Active China Beneficiary Account: 
             <el-select v-model="active_bank_setting.beneficiary_id" size="mini">
                 <el-option
                   v-for="item in options_china_bank"
@@ -36,6 +36,7 @@
                 </el-option>
             </el-select>
         </el-form-item>
+        <br>
         <el-form-item>
             <el-button type="primary" size="mini" :loading="loading_btn" @click="EditActiveBankSetting">Update</el-button>
         </el-form-item>
@@ -74,7 +75,7 @@ export default {
                     this.options_CIEF = malaysiaBankData.map(function(item){
                         return {
                             value : item.id,
-                            label : item.acc_no,
+                            label : item.company_name + " - " + item.acc_no,
                         };
                     });
                 })
@@ -96,7 +97,7 @@ export default {
                     this.options_china_bank = chinaBankData.map(function(item){
                         return {
                             value : item.id,
-                            label : item.acc_no,
+                            label : item.company_name + " - " + item.acc_no,
                         };
                     });
                     this.options_china_bank.unshift({
diff --git a/resources/assets/js/pages/settings/admin-china-bank.vue b/resources/assets/js/pages/settings/admin-china-bank.vue
index 9509fff1..1c960e49 100644
--- a/resources/assets/js/pages/settings/admin-china-bank.vue
+++ b/resources/assets/js/pages/settings/admin-china-bank.vue
@@ -23,41 +23,38 @@
 			<el-dialog title="Add New Data" align="center" :visible.sync="AddDatadialogVisible" width="40%">
 				<el-form label-width="150px">
 					<el-form-item label="Company Name">
-						<el-input v-model="beneficiariesForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<el-input v-model="beneficiariesForm.company_name" name="company_name"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Name">
-						<el-input v-model="beneficiariesForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<el-input v-model="beneficiariesForm.bank_name" name="bank_name"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Account No">
-						<el-input v-model="beneficiariesForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<el-input v-model="beneficiariesForm.acc_no" name="acc_no"></el-input>
 					
 					</el-form-item>
 					<el-form-item label="Bank Address">
-						<el-input v-model="beneficiariesForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
+						<el-input v-model="beneficiariesForm.bank_address" name="bank_address"></el-input>
 					
 					</el-form-item>
 					<el-form-item label="SWIFT Code">
-						<el-input v-model="beneficiariesForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
+						<el-input v-model="beneficiariesForm.swift" name="swift"></el-input>
 					
 					</el-form-item>
 					<el-form-item label="CNAP">
-						<el-input v-model="beneficiariesForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
+						<el-input v-model="beneficiariesForm.cnap" name="cnap" ></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Branch">
-						<el-input v-model="beneficiariesForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
+						<el-input v-model="beneficiariesForm.bank_branch" name="bank_branch"></el-input>
 						
 					</el-form-item>
 				</el-form>
 				<div align="center">
 					<el-button @click="AddDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" :loading="loading_btn" @click="CreateBeneficiaries" :disabled="beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">OK</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="CreateBeneficiaries" :disabled="beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' ? true : false">OK</el-button>
 				</div>
-				<span slot="footer" class="dialog-footer">
-					* Please key in the data in Chinese
-				</span>
 			</el-dialog>
 			<el-dialog align="center" :visible.sync="DoneAddDatadialogVisible" width="30%">
 				<span>Data Added Successfully</span><br><br>
@@ -70,35 +67,35 @@
 			<el-dialog title="Edit Data" align="center" :visible.sync="EditDatadialogVisible" width="40%">
 				<el-form label-width="150px">
 					<el-form-item label="Company Name">
-						<el-input v-model="beneficiariesForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>	
+						<el-input v-model="beneficiariesForm.company_name" name="company_name"></el-input>	
 					</el-form-item>
 					<el-form-item label="Bank Name">
-						<el-input v-model="beneficiariesForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<el-input v-model="beneficiariesForm.bank_name" name="bank_name"></el-input>
 					</el-form-item>
 					<el-form-item label="Bank Account No">
-						<el-input v-model="beneficiariesForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<el-input v-model="beneficiariesForm.acc_no" name="acc_no"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Address">
-						<el-input v-model="beneficiariesForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
+						<el-input v-model="beneficiariesForm.bank_address" name="bank_address"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="SWIFT Code">
-						<el-input v-model="beneficiariesForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
+						<el-input v-model="beneficiariesForm.swift" name="swift"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="CNAP">
-						<el-input v-model="beneficiariesForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
+						<el-input v-model="beneficiariesForm.cnap" name="cnap" ></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Branch">
-						<el-input v-model="beneficiariesForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
+						<el-input v-model="beneficiariesForm.bank_branch" name="bank_branch"></el-input>
 						
 					</el-form-item>
 				</el-form>
 				<div align="center">
 					<el-button @click="EditDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" :loading="loading_btn" @click="EditBeneficiaries" :disabled="beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">Submit</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="EditBeneficiaries" :disabled="beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' ? true : false">Submit</el-button>
 				</div>
 				<span slot="footer" class="dialog-footer">
 					* Please key in the data in Chinese
diff --git a/resources/assets/js/pages/settings/admin-malaysia-bank.vue b/resources/assets/js/pages/settings/admin-malaysia-bank.vue
index ebf2f3ad..adf91f02 100644
--- a/resources/assets/js/pages/settings/admin-malaysia-bank.vue
+++ b/resources/assets/js/pages/settings/admin-malaysia-bank.vue
@@ -23,41 +23,38 @@
 			<el-dialog title="Add New Data" align="center" :visible.sync="AddDatadialogVisible" width="40%">
 				<el-form label-width="150px">
 					<el-form-item label="Company Name">
-						<el-input v-model="malaysiaBankForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<el-input v-model="malaysiaBankForm.company_name" name="company_name"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Name">
-						<el-input v-model="malaysiaBankForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<el-input v-model="malaysiaBankForm.bank_name" name="bank_name"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Account No">
-						<el-input v-model="malaysiaBankForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<el-input v-model="malaysiaBankForm.acc_no" name="acc_no"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Address">
-						<el-input v-model="malaysiaBankForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
+						<el-input v-model="malaysiaBankForm.bank_address" name="bank_address"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="SWIFT Code">
-						<el-input v-model="malaysiaBankForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
+						<el-input v-model="malaysiaBankForm.swift" name="swift"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="CNAP">
-						<el-input v-model="malaysiaBankForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
+						<el-input v-model="malaysiaBankForm.cnap" name="cnap" ></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Branch">
-						<el-input v-model="malaysiaBankForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
+						<el-input v-model="malaysiaBankForm.bank_branch" name="bank_branch"></el-input>
 						
 					</el-form-item>
 				</el-form>
 				<div align="center">
 					<el-button @click="AddDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" :loading="loading_btn" @click="CreateMalaysiaBank" :disabled="malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">OK</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="CreateMalaysiaBank" :disabled="malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' ? true : false">OK</el-button>
 				</div>
-				<span slot="footer" class="dialog-footer">
-					* Please key in the data in Chinese
-				</span>
 			</el-dialog>
 			<el-dialog align="center" :visible.sync="DoneAddDatadialogVisible" width="30%">
 				<span>Data Added Successfully</span><br><br>
@@ -70,41 +67,38 @@
 			<el-dialog title="Edit Data" align="center" :visible.sync="EditDatadialogVisible" width="40%">
 				<el-form label-width="150px">
 					<el-form-item label="Company Name">
-						<el-input v-model="malaysiaBankForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<el-input v-model="malaysiaBankForm.company_name" name="company_name"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Name">
-						<el-input v-model="malaysiaBankForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<el-input v-model="malaysiaBankForm.bank_name" name="bank_name"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Account No">
-						<el-input v-model="malaysiaBankForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<el-input v-model="malaysiaBankForm.acc_no" name="acc_no"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="Bank Address">
-						<el-input v-model="malaysiaBankForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
+						<el-input v-model="malaysiaBankForm.bank_address" name="bank_address"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="SWIFT Code">
-						<el-input v-model="malaysiaBankForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
+						<el-input v-model="malaysiaBankForm.swift" name="swift"></el-input>
 						
 					</el-form-item>
 					<el-form-item label="CNAP">
-						<el-input v-model="malaysiaBankForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
+						<el-input v-model="malaysiaBankForm.cnap" name="cnap" ></el-input>
 					
 					</el-form-item>
 					<el-form-item label="Bank Branch">
-						<el-input v-model="malaysiaBankForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
+						<el-input v-model="malaysiaBankForm.bank_branch" name="bank_branch"></el-input>
 						
 					</el-form-item>
 				</el-form>
 				<div align="center">
 					<el-button @click="EditDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" :loading="loading_btn" @click="EditMalaysiaBank" :disabled="malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">Submit</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="EditMalaysiaBank" :disabled="malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' ? true : false">Submit</el-button>
 				</div>
-				<span slot="footer" class="dialog-footer">
-					* Please key in the data in Chinese
-				</span>
 			</el-dialog>
 			<el-dialog align="center" :visible.sync="DoneUpdateDatadialogVisible" width="30%">
 				<span>Data Updated Successfully</span><br><br>