diff --git a/resources/assets/js/views/estimates/Create.vue b/resources/assets/js/views/estimates/Create.vue
index 8ecbfc14..5f5a83ad 100644
--- a/resources/assets/js/views/estimates/Create.vue
+++ b/resources/assets/js/views/estimates/Create.vue
@@ -553,6 +553,8 @@ export default {
         if (response.data) {
           this.selectCustomer(response.data.estimate.user_id)
           this.newEstimate = response.data.estimate
+          this.newEstimate.estimate_date = moment(response.data.estimate.estimate_date, 'YYYY-MM-DD').toString()
+          this.newEstimate.expiry_date = moment(response.data.estimate.expiry_date, 'YYYY-MM-DD').toString()
           this.discountPerItem = response.data.discount_per_item
           this.taxPerItem = response.data.tax_per_item
           this.selectedCurrency = this.defaultCurrency
diff --git a/resources/assets/js/views/invoices/Create.vue b/resources/assets/js/views/invoices/Create.vue
index abe44796..e2e43ddd 100644
--- a/resources/assets/js/views/invoices/Create.vue
+++ b/resources/assets/js/views/invoices/Create.vue
@@ -554,6 +554,8 @@ export default {
         if (response.data) {
           this.selectCustomer(response.data.invoice.user_id)
           this.newInvoice = response.data.invoice
+          this.newInvoice.invoice_date = moment(response.data.invoice.invoice_date, 'YYYY-MM-DD').toString()
+          this.newInvoice.due_date = moment(response.data.invoice.due_date, 'YYYY-MM-DD').toString()
           this.discountPerItem = response.data.discount_per_item
           this.taxPerItem = response.data.tax_per_item
           this.selectedCurrency = this.defaultCurrency
diff --git a/resources/assets/sass/pages/estimates/create.scss b/resources/assets/sass/pages/estimates/create.scss
index 8e4f3ce5..cf767f0f 100644
--- a/resources/assets/sass/pages/estimates/create.scss
+++ b/resources/assets/sass/pages/estimates/create.scss
@@ -58,6 +58,7 @@
 
         .content {
             display: flex;
+            flex:1;
             flex-direction: column;
 
             label {
@@ -445,6 +446,9 @@
                 .estimate-amount {
                     font-size: 18px;
                     color: #55547A;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
                 }
 
                 .total {
diff --git a/resources/assets/sass/pages/invoices/create.scss b/resources/assets/sass/pages/invoices/create.scss
index 6cd9f81a..d7d1fffc 100644
--- a/resources/assets/sass/pages/invoices/create.scss
+++ b/resources/assets/sass/pages/invoices/create.scss
@@ -58,6 +58,7 @@
 
         .content {
             display: flex;
+            flex: 1;
             flex-direction: column;
 
             label {
@@ -445,6 +446,9 @@
                 .invoice-amount {
                     font-size: 18px;
                     color: #55547A;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
                 }
 
                 .total {