diff --git a/.env.example b/.env.example
index b26bfbf8..47a20e74 100644
--- a/.env.example
+++ b/.env.example
@@ -48,4 +48,6 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 FILESYSTEM_DRIVER="documents"
 
 JWT_SECRET=
-JWT_TTL=1440
\ No newline at end of file
+JWT_TTL=1440
+
+IS_PRODUCTION=false
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/PaymentApprovals.php b/app/Classes/General/Eloquent/Filters/PaymentApprovals.php
index 617eb67b..981764a3 100644
--- a/app/Classes/General/Eloquent/Filters/PaymentApprovals.php
+++ b/app/Classes/General/Eloquent/Filters/PaymentApprovals.php
@@ -14,7 +14,7 @@ class PaymentApprovals implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->payments()->inComplete();
+        return $builder->payments()->inComplete()->has('documents');
     }
 
 }
\ No newline at end of file
diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index a543f00d..ef652fd7 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -19,6 +19,7 @@ class TransactionResource extends JsonResource
         return [
             'id' => $this->id,
             'booking' => new BookingResource($this->booking),
+            'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'amount' => (double) $this->amount,
             'original_amount' => (double) $this->original_amount,
diff --git a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
index 9425b3f5..30bf75c4 100644
--- a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
+++ b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
@@ -82,7 +82,7 @@
                     </div>
                     <div class="row">
                         <div class="col p-r-5">
-                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" :data-dismiss="type !== 2 ? 'modal':''" @click="$emit('close')">Cancel</div>
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" :data-dismiss="closable ? 'modal' : ''" @click="$emit('close')">Cancel</div>
                         </div>
                         <div class="col p-l-5">
                             <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Add Account</div>
@@ -106,6 +106,10 @@
                 type: Number,
                 default: 1
             },
+            closable: {
+                type: Boolean,
+                default: true
+            },
             country_id: {
                 type: Number,
                 default: 1
diff --git a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
index 92966dc5..9324faf4 100644
--- a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
@@ -145,7 +145,7 @@
                             </div>
                             <div class="row" v-show="createBank">
                                 <div class="col">
-                                    <bank-account-form-component section="customerProfileSection" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" v-on:close="createBank = !createBank"></bank-account-form-component>
+                                    <bank-account-form-component section="customerProfileSection" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :closable=false v-on:close="createBank = !createBank"></bank-account-form-component>
                                 </div>
                             </div>
                         </div>
diff --git a/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
index b9a7d6f5..d8aaa0d1 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
@@ -14,26 +14,29 @@
                                     </div>
                                 </div>
                                 <div class="col-auto">
-                                    <div class="font-heading fs-10 muted all-caps">Amount</div>
-                                    <div class="font-heading fs-12 text-success bold">
-                                        MYR {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
-                                    </div>
+                                    <div class="font-heading fs-10 muted all-caps">Transfer No.</div>
+                                    <a :href="route('booking.details', item.booking.marking)">
+                                        <div class="font-heading fs-10">
+                                            {{item.booking.marking}}
+                                        </div>
+                                    </a>
                                 </div>
-                                <div class="col">
-                                    <div class="font-heading fs-10 muted all-caps">Original</div>
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Marking</div>
                                     <div class="font-heading fs-10">
-                                        {{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                        {{item.booking.company.reference}}
                                     </div>
                                 </div>
-                                <div class="col-auto text-right">
+                                <div class="col text-right">
                                     <div class="font-heading fs-10 muted all-caps">Date</div>
                                     <div class="font-heading fs-10">
                                         {{item.updated_at}}
                                     </div>
                                 </div>
                             </div>
-                            <div class="row align-items-end">
-                                <div class="col">
+                            <div class="row m-t-10">
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Payment Proof</div>
                                     <div class="row no-margin">
                                         <div v-if="item.documents != null">
                                             <div v-for="file in item.documents.files" v-bind:key="file.id"  class="col-auto no-padding m-r-5">
@@ -48,6 +51,18 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="col-auto">
+                                    <div class="font-heading fs-10 muted all-caps">Amount</div>
+                                    <div class="font-heading fs-12 text-success bold">
+                                        MYR {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="font-heading fs-10 muted all-caps">Original</div>
+                                    <div class="font-heading fs-10">
+                                        {{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                    </div>
+                                </div>
                                 <div class="col-auto text-right">
                                     <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="rejectPayment">
                                         <i class="fa fa-times fa-fw"></i>
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index 057a1aa2..2f728a0b 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -335,7 +335,7 @@
                                                 <div class="col-auto p-l-0">
                                                     <div class="font-heading fs-8 muted all-caps">Payment Amount</div>
                                                     <div class="font-heading fs-10 bold">
-                                                        {{item.currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                                        {{ item.type === 3 ? item.original_currency.short_code : item.currency.short_code}} {{(Math.round((item.type === 3 ? item.original_amount : item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
                                                     </div>
                                                 </div>
                                             </div>
diff --git a/resources/views/pages/banks/customers.blade.php b/resources/views/pages/banks/customers.blade.php
index 9e791d9b..d755c801 100644
--- a/resources/views/pages/banks/customers.blade.php
+++ b/resources/views/pages/banks/customers.blade.php
@@ -1,15 +1,15 @@
 <div class="row d-none" :class="[{'d-flex': !$store.getters.isAdmin}]" v-if="!$store.getters.isAdmin">
-    <div class="col bg-white p-l-25 p-r-25 p-t-15 p-b-15">
+    <div class="col-6 bg-white p-l-25 p-r-25 p-t-15 p-b-15">
 		<div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
             <div class="col">
                 <div class="font-heading all-caps fs-10 hint-text">
-                    Customer's Bank Accounts
+                    Recipients Bank Accounts
                 </div>
             </div>
             <div class="col-auto">
                 <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
                     <i class="fa fa-plus m-r-5"></i>
-                    Add New Bank Account
+                    Add New Recipient
                 </button>
                 <modal-form-component section="banksSection">
                     <template slot="form" slot-scope="{section}">
@@ -18,7 +18,7 @@
                 </modal-form-component>
             </div>
         </div>
-        <div class="row m-b-20">
+        <div class="row m-b-20 m-r-0">
             <div class="col">
                 <list-component section="banksSection" :endpoint="route('api.bank.list')" :options="{'company_id': this.$store.getters.getCompanyId}">
                     <template slot="list" slot-scope="{data}">
diff --git a/resources/views/pages/booking_details.blade.php b/resources/views/pages/booking_details.blade.php
index 5d0ec932..a9ad70a7 100644
--- a/resources/views/pages/booking_details.blade.php
+++ b/resources/views/pages/booking_details.blade.php
@@ -3,7 +3,7 @@
     <div class="row">
         <div class="col">
             <booking-details-section-component :marking={{$marking}}></booking-details-section-component>
-            @if(!App()->environment('production'))
+            @if(!env('IS_PRODUCTION'))
                 <a class="btn btn-xs all-caps b-rad-none btn-warning" href="{{ route('booking.merge', $marking)}}">Merge Transfer Orders</a>
             @endif
         </div>
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index 534e3163..59396faf 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -22,8 +22,9 @@
                     <div class="col text-right p-r-30 ">
                         <div class="row justify-content-end">
                             <div class="col text-left">
-                                <div class="row justify-content-start">
-                                    <div class="col-auto p-r-20 hide">
+                                @if(!env('IS_PRODUCTION'))
+                                <div class="row justify-content-end">
+                                    <div class="col-auto p-r-20">
                                         <a href="{{route('dashboard')}}"><div class="text-white all-caps fs-12">Dashboard</div></a>
                                     </div>
                                     <div class="col-auto p-r-20 hide">
@@ -36,6 +37,7 @@
                                         <a href="{{route('bank')}}"><div class="text-white all-caps fs-12">Bank Accounts</div></a>
                                     </div>
                                 </div>
+                                @endif
                             </div>
                         </div>
                     </div>