diff --git a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
index 01974869..c958f018 100644
--- a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
@@ -157,7 +157,7 @@
                                                             <alipay-account-form-component v-if="isAlipayOrder" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount  : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></alipay-account-form-component>
                                                         </div>
                                                     </div>
-                                                    <div v-if="isOneSizEightEightOrder">
+                                                    <div class="b-t b-dashed m-t-15 b-grey" v-if="isOneSizEightEightOrder">
                                                         <div class="row p-r-15 m-t-10" v-for="(order, index) in order_reference_no">
                                                             <div class="col p-r-0">
                                                                 <div class="form-group no-margin form-group-default">
@@ -167,7 +167,7 @@
                                                                     <input type="text" class="form-control" v-model="order_reference_no[index]">
                                                                 </div>
                                                             </div>
-                                                            <div class="col-auto bg-danger pointer" v-if="index !== 0" @click="order_reference_no.splice(index, 1)">
+                                                            <div class="col-auto bg-danger pointer" v-if="order_reference_no.length > 1" @click="order_reference_no.splice(index, 1)">
                                                                 <div class="row h-100 align-items-center">
                                                                     <div class="col">
                                                                         <i class="fa fa-times fa-fw text-white"></i>
@@ -175,11 +175,10 @@
                                                                 </div>
                                                             </div>
                                                         </div>
-                                                        <div class="row">
-                                                            <div class="col">
-                                                                <div class="btn btn-sm btn-success btn-block b-rad-none" @click="order_reference_no.push('')">Add Order Reference</div>
-                                                            </div>
-                                                        </div>
+                                                        <button class="btn btn-xs btn-outline-primary b-rad-none m-t-10" @click="order_reference_no.push('')" :disabled="isLatestReferenceEmpty">
+                                                            <i class="fa fa-plus m-r-5"></i>
+                                                            Add Order Reference
+                                                        </button>
                                                     </div>
                                                     
                                                 </div>
@@ -381,8 +380,11 @@
                 return [1, 2];
             }
 
-
             return [];
+          },
+          isLatestReferenceEmpty() {
+            var latestValue = this.order_reference_no[this.order_reference_no.length - 1];
+            return latestValue == '' || latestValue == undefined;
           }
         },
         created(){
diff --git a/resources/assets/vue/components/bookings/forms/BookingOrderReferenceFormComponent.vue b/resources/assets/vue/components/bookings/forms/BookingOrderReferenceFormComponent.vue
index 89db55e6..dc7c314d 100644
--- a/resources/assets/vue/components/bookings/forms/BookingOrderReferenceFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingOrderReferenceFormComponent.vue
@@ -46,12 +46,10 @@
                         </div>
                     </div>
                     <div class="row m-t-10">
-                        <div class="col">
+                        <div class="col-8 p-r-5">
                             <button class="btn btn-block btn-sm btn-success b-rad-none" @click="updateOrderReferences">Update Order References</button>
                         </div>
-                    </div>
-                    <div class="row m-t-10">
-                        <div class="col">
+                        <div class="col-4 p-l-5">
                             <button class="btn btn-block btn-sm btn-default b-rad-none" @click="resetOrderReference">Cancel</button>
                         </div>
                     </div>
diff --git a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
index da407cfb..3e55bcd4 100644
--- a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
+++ b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="row m-b-15 align-items-end parentContainer">
+    <div class="row m-b-15 align-items-end parentContainer" v-if="data">
         <div class="col">
             <!-- 1688 consent -->
             <div class="row m-l-0 m-r-0 m-b-15 animate__animated animate__tada animate__repeat-2 animate__delay-3s" v-if="!data.segments.some(item => item.id === 13 || item.id === 16)">
diff --git a/resources/assets/vue/components/wallets/elements/WalletComponent.vue b/resources/assets/vue/components/wallets/elements/WalletComponent.vue
index aef834f1..687cfb81 100644
--- a/resources/assets/vue/components/wallets/elements/WalletComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="row parentContainer" v-if="item.status === 2">
+    <div class="row parentContainer" v-if="item && item.status === 2">
         <div class="col">
             <div class="row m-b-20 parentContainer" v-if="data.id === 9">
                 <div class="col-auto">