diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 80bd2cd0..4cab0ccb 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -20,8 +20,8 @@
                                 <div class="col-auto">
                                     <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
                                 </div>
-                                <div class="col">
-                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal" data-type="changeOrderNo">Change Order Number</div>
+                                <div class="col d-flex">
+                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo">Change Order Number</div>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
                                         <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
                                     </modal-component>
@@ -33,7 +33,7 @@
                                         <div class="col-auto d-flex align-items-center">
                                             <h6 class="no-margin"><b>Remark:</b></h6>
                                         </div>
-                                        <div class="col-auto p-l-0" v-if="!addComment">
+                                        <div class="col-auto p-l-0" v-if="!addComment && order.remarks.length == 0">
                                             <div class="btn btn-xs btn-outline-info b-rad-none pointer" @click="addComment = !addComment">Add a Remark</div>
                                         </div>
                                         <div class="col d-flex align-items-center pl-3 pl-md-0" v-if="order.remarks.length >= 1 && !isEditRemark">