diff --git a/resources/assets/vue/components/containers/elements/ContainerArrivalFormComponent.vue b/resources/assets/vue/components/containers/elements/ContainerArrivalFormComponent.vue
index 88154f51..50a75bfc 100644
--- a/resources/assets/vue/components/containers/elements/ContainerArrivalFormComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerArrivalFormComponent.vue
@@ -1,9 +1,6 @@
 <template>
     <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
         <div class="col bg-white padding-40 b-rad-lg">
-            <div class="absolute" style="right: -25px; top: -10px;">
-                <div class="icon-thumbnail btn-rounded icon-25 bg-master fs-12" data-dismiss="modal"><i class="fa fa-times text-white fs-12"></i></div>
-            </div>
             <div class="row m-auto" style="width: 300px;">
                 <div class="col text-center">
                     <p :class="[{'hide': expanded}]">Are you sure this container has arrived the Destination Port today?</p>
@@ -24,7 +21,14 @@
             </div>
             <div class="row m-t-15">
                 <div class="col">
-                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.container.update_dispatch_date', data.id), 'put', section, true, true)">Confirm</div>
+                    <div class="row">
+                        <div class="col-auto p-r-5">
+                            <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.container.update_dispatch_date', data.id), 'put', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
                     <p class="text-right small-text m-b-0" @click="expanded = !expanded" >Choose another Date</p>
                 </div>
             </div>
diff --git a/resources/assets/vue/components/containers/elements/ContainerDepatureFormComponent.vue b/resources/assets/vue/components/containers/elements/ContainerDepatureFormComponent.vue
index bd1df1b2..b3c204ab 100644
--- a/resources/assets/vue/components/containers/elements/ContainerDepatureFormComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerDepatureFormComponent.vue
@@ -1,9 +1,6 @@
 <template>
     <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
         <div class="col bg-white padding-40 b-rad-lg">
-            <div class="absolute" style="right: -25px; top: -10px;">
-                <div class="icon-thumbnail btn-rounded icon-25 bg-master fs-12" data-dismiss="modal"><i class="fa fa-times text-white fs-12"></i></div>
-            </div>
             <div class="row m-auto" style="width: 300px;">
                 <div class="col text-center">
                     <p :class="[{'hide': expanded}]">Are you sure the container has depart from the origin port today?</p>
@@ -24,8 +21,15 @@
             </div>
             <div class="row m-t-15">
                 <div class="col">
-                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.container.update_drop_date', data.id), 'put', section, true, true)">Confirm</div>
-                    <p class="text-right small-text m-b-0" @click="expanded = !expanded" >Choose another Date</p>
+                    <div class="row">
+                        <div class="col-auto p-r-5">
+                            <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.container.update_drop_date', data.id), 'put', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                    <p class="text-right small-text m-b-0 cursor" @click="expanded = !expanded" >Choose another Date</p>
                 </div>
             </div>
         </div>
diff --git a/resources/assets/vue/components/containers/elements/EditContainerFormComponent.vue b/resources/assets/vue/components/containers/elements/EditContainerFormComponent.vue
new file mode 100644
index 00000000..25df6f59
--- /dev/null
+++ b/resources/assets/vue/components/containers/elements/EditContainerFormComponent.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="row" style="width: 600px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-20 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col">
+                    <h3 class="bold fs-20 m-b-0">Edit Package</h3>
+                    <p class="normal-text muted">Process of editing the container needs to verify from the warehouse</p>
+                </div>
+            </div>
+            <div class="row m-t-20">
+                <div class="col">
+                    <div class="row m-auto mt-10 mb-10">
+                        <div class="col p-l-0 p-r-10">
+                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.container_number">
+                                <label class="semi-bold text-primary">Container Number</label>
+                                <input type="text" class="form-control fs-12">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col p-r-0 p-l-10">
+                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.sealing_number">
+                                <label class="semi-bold text-primary">Sealing Number</label>
+                                <input type="text" class="form-control">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row m-t-15">
+                <div class="col d-flex justify-content-end">
+                    <div class="btn btn-default btn-sm bg-master-light m-r-10 text-white padding-10 p-l-40 p-r-40 rounded" data-dismiss="modal">Cancel</div>
+                    <div class="btn btn-default btn-sm b-primary btn-outline-primary padding-10 p-l-40 p-r-40 rounded">Upload</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        data() {
+            return {
+                parameters: {
+                    container_number: this.container_number, 
+                    sealing_number: this.sealing_number, 
+                }
+            };
+        },
+        validations: {
+            parameters: {
+                container_number: { required },
+                sealing_number: { required },
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/containers/elements/RescheduleDateFormComponent.vue b/resources/assets/vue/components/containers/elements/RescheduleDateFormComponent.vue
index 12e37ee6..211377a7 100644
--- a/resources/assets/vue/components/containers/elements/RescheduleDateFormComponent.vue
+++ b/resources/assets/vue/components/containers/elements/RescheduleDateFormComponent.vue
@@ -1,9 +1,6 @@
 <template>
     <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
         <div class="col bg-white padding-40 b-rad-lg">
-            <div class="absolute" style="right: -25px; top: -10px;">
-                <div class="icon-thumbnail btn-rounded icon-25 bg-master fs-12" data-bs-dismiss="modal" aria-label="Close"><i class="fa fa-times text-white fs-12"></i></div>
-            </div>
             <div class="row m-b-10">
                 <div class="col text-center">
                     <p>Plese set the approximate dates of below.</p>
@@ -12,13 +9,13 @@
             <div class="row">
                 <div class="col">
                     <div class="row m-auto mt-10 mb-10">
-                        <div class="col">
+                        <div class="col p-l-0 p-r-10">
                             <validation-wrapper-component class="m-b-15" :validator="$v.parameters.etd">
                                 <label class="text-primary">Etd</label>
                                 <date-picker-component :parameters="parameters" :value="'etd'"></date-picker-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col">
+                        <div class="col p-r-0 p-l-10">
                             <validation-wrapper-component class="m-b-15" :validator="$v.parameters.eta">
                                 <label class="text-primary">Eta</label>
                                 <date-picker-component :parameters="parameters" :value="'eta'"></date-picker-component>
@@ -27,8 +24,11 @@
                     </div>
                 </div>
             </div>
-            <div class="row m-t-15 m-l-20 m-r-20">
-                <div class="col">
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
                     <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.container.reschedule', data.id), 'put', section, true, true)">Confirm</div>
                 </div>
             </div>
diff --git a/resources/assets/vue/components/containers/elements/containerUnpackingFormContainer.vue b/resources/assets/vue/components/containers/elements/containerUnpackingFormContainer.vue
index fe665a37..cd16efa6 100644
--- a/resources/assets/vue/components/containers/elements/containerUnpackingFormContainer.vue
+++ b/resources/assets/vue/components/containers/elements/containerUnpackingFormContainer.vue
@@ -1,16 +1,16 @@
 <template>
     <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
         <div class="col bg-white padding-40 b-rad-lg">
-            <div class="absolute" style="right: -25px; top: -10px;">
-                <div class="icon-thumbnail btn-rounded icon-25 bg-master fs-12" data-dismiss="modal"><i class="fa fa-times text-white fs-12"></i></div>
-            </div>
             <div class="row m-auto" style="width: 300px;">
                 <div class="col text-center">
                     <p>Are you sure this container has been unpacked today?</p>
                 </div>
             </div>
-            <div class="row m-t-15">
-                <div class="col">
+              <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
                     <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.container.complete', data.id), 'put', section, true, true)">Confirm</div>
                 </div>
             </div>