diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
index d81f91f47..3709ed33e 100644
--- a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
+++ b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
@@ -126,13 +126,13 @@ export default {
     return {
       currentSelection: null,
       dateFrom:
-        this.data[3] && this.data[3].data.dateFromRisk
-          ? this.data[3].data.dateFromRisk
-          : moment().format("YYYY-MM-DD"),
+        this.data[3] && this.data[3].data.dateFrom
+          ? this.data[3].data.dateFrom
+          : moment().subtract(30, "d").format("YYYY-MM-DD"),
       dateTo:
-        this.data[3] && this.data[3].data.dateToRisk
-          ? this.data[3].data.dateToRisk
-          : moment().add(30, "d").format("YYYY-MM-DD"),
+        this.data[3] && this.data[3].data.dateTo
+          ? this.data[3].data.dateTo
+          : moment().format("YYYY-MM-DD"),
       dateNow: moment().format("DD/MM/YYYY h:mm:ss a"),
       size:
         this.data[3] && this.data[3].data.size
@@ -462,11 +462,9 @@ export default {
         name: this.data[2]["name"],
         level: 3,
         data: {
-          dateFrom: this.data[3].data.dateFrom,
-          dateTo: this.data[3].data.dateTo,
+          dateFrom: this.dateFrom,
+          dateTo: this.dateTo,
           period: this.data[3].data.period,
-          dateFromRisk: this.dateFrom,
-          dateToRisk: this.dateTo,
           size: this.size,
           riskType: this.riskType,
         },
diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue b/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue
index 9101782c5..1c807baba 100644
--- a/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue
+++ b/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue
@@ -58,8 +58,8 @@
         :options="options"
         :series="series"
       ></apexchart>
-      <div class="row">
-        <div class="col-sm vp-align-right">
+      <div class="vp-text-align-center">
+        <div class="vp-align-right vp-inline-block">
           <button
             @click="onClickDrillDown()"
             type="button"
@@ -69,7 +69,7 @@
             ><span class="vp-padding-l10">{{ $t("ID_DRILL") }}</span>
           </button>
         </div>
-        <div class="col-sm">
+        <div class="vp-inline-block">
           <button @click="onClickData()" type="button" class="btn btn-primary">
             <i class="fas fa-th"></i
             ><span class="vp-padding-l10">{{ $t("ID_DATA") }}</span>
@@ -100,10 +100,10 @@ export default {
     return {
       dateFrom: this.data[3]
         ? this.data[3].data.dateFrom
-        : moment().format("YYYY-MM-DD"),
+        : moment().subtract(30, "d").format("YYYY-MM-DD"),
       dateTo: this.data[3]
         ? this.data[3].data.dateTo
-        : moment().add(30, "d").format("YYYY-MM-DD"),
+        : moment().format("YYYY-MM-DD"),
       period: this.data[3] ? this.data[3].data.period : "day",
       periodOptions: [
         { text: this.$t("ID_DAY"), value: "day" },
@@ -338,5 +338,9 @@ export default {
 .vp-padding-l20 {
   padding-left: 20px;
 }
+
+.vp-text-align-center {
+  text-align: center;
+}
 </style>
 <style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
\ No newline at end of file