diff --git a/js/apps/system/aardvark/frontend/js/config/dygraphConfig.js b/js/apps/system/aardvark/frontend/js/config/dygraphConfig.js
index 3982451a14..a71204e4b7 100644
--- a/js/apps/system/aardvark/frontend/js/config/dygraphConfig.js
+++ b/js/apps/system/aardvark/frontend/js/config/dygraphConfig.js
@@ -166,61 +166,73 @@
         div: "requestsChart"
       }
     },
+    
+    getDashBoardFigures : function (all) {
+      var result = [], self = this;
+      Object.keys(this.figureDependedOptions).forEach(function (k) {
+        // ClusterRequestsPerSecond should not be ignored. Quick Fix
+        if (k !== "clusterRequestsPerSecond" && (self.figureDependedOptions[k].div || all)) {
+          result.push(k);
+        }
+      });
+      return result;
+    },
 
-        //configuration for chart overview
-        getDefaultConfig: function (figure) {
-            var self = this;
-            var result = {
-                digitsAfterDecimal: 1,
-                drawGapPoints: true,
-                fillGraph: true,
-                showLabelsOnHighlight: false,
-                strokeWidth: 1.5,
-                strokeBorderWidth: 1.5,
-                includeZero: true,
-                highlightCircleSize: 2.5,
-                labelsSeparateLines : true,
-                strokeBorderColor: '#ffffff',
-                interactionModel: {},
-                maxNumberWidth : 10,
-                colors: [this.colors[0]],
-                xAxisLabelWidth: "50",
-                rightGap: 15,
-                showRangeSelector: false,
-                rangeSelectorHeight: 50,
-                rangeSelectorPlotStrokeColor: '#365300',
-                rangeSelectorPlotFillColor: '',
-                // rangeSelectorPlotFillColor: '#414a4c',
-                pixelsPerLabel: 50,
-                labelsKMG2: true,
-                dateWindow: [
-                    new Date().getTime() -
-                    this.defaultFrame,
-                    new Date().getTime()
-                ],
-                axes: {
-                    x: {
-                        valueFormatter: function (d) {
-                            return self.xAxisFormat(d);
-                        }
-                    },
-                    y: {
-                        ticker: Dygraph.numericLinearTicks
-                    }
-                }
-            };
-            if (this.figureDependedOptions[figure]) {
-                result = this.mergeObjects(
-                    result, this.figureDependedOptions[figure], ["axes"]
-                );
-                if (result.div && result.labels) {
-                    result.colors = this.getColors(result.labels);
-                    result.labelsDiv = document.getElementById(result.div + "Legend");
-                    result.legend = "always";
-                    result.showLabelsOnHighlight = true;
-                }
+    //configuration for chart overview
+    getDefaultConfig: function (figure) {
+      var self = this;
+      var result = {
+        digitsAfterDecimal: 1,
+        drawGapPoints: true,
+        fillGraph: true,
+        showLabelsOnHighlight: false,
+        strokeWidth: 1.5,
+        strokeBorderWidth: 1.5,
+        includeZero: true,
+        highlightCircleSize: 2.5,
+        labelsSeparateLines : true,
+        strokeBorderColor: '#ffffff',
+        interactionModel: {},
+        maxNumberWidth : 10,
+        colors: [this.colors[0]],
+        xAxisLabelWidth: "50",
+        rightGap: 15,
+        showRangeSelector: false,
+        rangeSelectorHeight: 50,
+        rangeSelectorPlotStrokeColor: '#365300',
+        rangeSelectorPlotFillColor: '',
+        // rangeSelectorPlotFillColor: '#414a4c',
+        pixelsPerLabel: 50,
+        labelsKMG2: true,
+        dateWindow: [
+          new Date().getTime() -
+            this.defaultFrame,
+          new Date().getTime()
+        ],
+        axes: {
+          x: {
+            valueFormatter: function (d) {
+              return self.xAxisFormat(d);
             }
-            return result;
+          },
+          y: {
+            ticker: Dygraph.numericLinearTicks
+          }
+        }
+      };
+      if (this.figureDependedOptions[figure]) {
+        result = this.mergeObjects(
+          result, this.figureDependedOptions[figure], ["axes"]
+        );
+        if (result.div && result.labels) {
+          result.colors = this.getColors(result.labels);
+          result.labelsDiv = document.getElementById(result.div + "Legend");
+          result.legend = "always";
+          result.showLabelsOnHighlight = true;
+        }
+      }
+      return result;
+
     },
 
     getDetailChartConfig: function (figure) {
diff --git a/js/apps/system/aardvark/frontend/scss/_newDashboard.scss b/js/apps/system/aardvark/frontend/scss/_newDashboard.scss
index 041bcc752f..9f07047eca 100644
--- a/js/apps/system/aardvark/frontend/scss/_newDashboard.scss
+++ b/js/apps/system/aardvark/frontend/scss/_newDashboard.scss
@@ -40,20 +40,19 @@
 .dashboard-large-chart {
   @extend %dashboard-chart-basic;
   margin-right: 12px;
-  position: relative;
 
   .dashboard-large-chart-inner {
     @extend %dashboard-chart-box;
     @extend %pull-left;
+    padding-top: $dashboard-padding;
     background-color: $c-white;
     border-left: $dashboard-borderwidth solid $c-e1grey;
-    border-right: $dashboard-borderwidth solid $c-e1grey;
     border-top: $dashboard-borderwidth solid $c-e1grey;
-    padding-top: $dashboard-padding;
+    border-right: $dashboard-borderwidth solid $c-e1grey;
 
     .dashboard-interior-chart {
       @extend %pull-left;
-      margin-bottom: 0;
+      margin-bottom: 0px;
     }
   }
 }
@@ -67,16 +66,16 @@
     @extend %pull-left;
     background-color: $c-white;
     border-left: $dashboard-borderwidth solid $c-e1grey;
-    border-right: $dashboard-borderwidth solid $c-e1grey;
     border-top: $dashboard-borderwidth solid $c-e1grey;
+    border-right: $dashboard-borderwidth solid $c-e1grey;
 
     .dashboard-interior-chart {
       @extend %pull-left;
 
       .nv-bar rect {
-        fill-opacity: .15;
         stroke-opacity: 1;
         stroke-width: 1px;
+        fill-opacity: 0.15;
       }
     }
   }
@@ -87,7 +86,9 @@
   @extend %dashboard-chart-box;
   @extend %dashboard-chart-basic;
   background-color: $c-white;
+  padding-top: $dashboard-padding;
   border-left: $dashboard-borderwidth solid $c-e1grey;
+  border-top: $dashboard-borderwidth solid $c-e1grey;
   border-right: $dashboard-borderwidth solid $c-e1grey;
   
   &:first-child {
@@ -96,18 +97,18 @@
 
   .dashboard-interior-chart {
     @extend %pull-left;
-    margin-bottom: 0;
+    margin-bottom: 0px;
   }
   
   .dashboard-medium-chart-menu {
     @extend %clear-float;
     @include border-radius(2px);
-    border: 0 solid $c-halfsemi-transp;
+    position: absolute;
     color: $c-halfsemi-transp;
     cursor: pointer;
-    padding: 0 4px;
-    position: absolute;
     z-index: 1000;
+    border: 0px solid $c-halfsemi-transp;
+    padding: 0px 4px 0px 4px;
   }
 
   .dashboard-medium-chart-menu:hover {
@@ -136,8 +137,8 @@
     @extend %clear-float;
     background-color: $c-white;
     border-left: 5px solid $c-e1grey;
-    border-right: 5px solid $c-e1grey;
     border-top: 5px solid $c-e1grey;
+    border-right: 5px solid $c-e1grey;
 
     .dashboard-tendency {
       @extend %pull-left;
@@ -172,13 +173,13 @@
     @extend %clear-float;
     background-color: $c-white;
     border-left: 5px solid $c-e1grey;
-    border-right: 5px solid $c-e1grey;
     border-top: 5px solid $c-e1grey;
+    border-right: 5px solid $c-e1grey;
 
     .dashboard-bar-chart-title {
       @extend %pull-left;
+      padding: 0px 8px 0px 8px;
       margin-top: 5px;
-      padding: 0 8px;
 
       .percentage {
         @extend %pull-left;
@@ -195,9 +196,9 @@
       @extend %pull-left;
 
       .nv-bar rect {
-        fill-opacity: .15;
         stroke-opacity: 1;
         stroke-width: 1px;
+        fill-opacity: 0.15;
       }
     }
   }
@@ -225,12 +226,12 @@
 
 
 .dashboard-spacer {
-  margin: 0 12px;
+ margin: 0px 12px 0px 12px;
 }
 
 
 .headerBar.dashboard-headerbar {
-  margin: 15px 0 10px;
+  margin: 15px 0px 10px 0px;
 }
 
 
@@ -272,7 +273,8 @@
   font-weight: 400;
   height: 30px;
   line-height: 30px;
-  padding: 0 5px 0 10px;
+  /* margin: 0px -1px 0px -1px; */
+  padding: 0px 5px 0px 10px;
 
   .dashboard-half-title-bar {
     @extend %pull-left;
@@ -290,9 +292,9 @@
 
 .dashboard-row {
   @extend %clear-float;
-  margin-bottom: 0;
-  margin-left: 0;
-  margin-right: 0;
+  margin-bottom: 0px;
+  margin-left: 0px;
+  margin-right: 0px;
 }
 
 
diff --git a/js/apps/system/aardvark/frontend/scss/cluster.css b/js/apps/system/aardvark/frontend/scss/cluster.css
index e916ad5a74..e7821c9812 100644
--- a/js/apps/system/aardvark/frontend/scss/cluster.css
+++ b/js/apps/system/aardvark/frontend/scss/cluster.css
@@ -2192,11 +2192,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 228px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -114px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 200px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       display: none;
@@ -2206,6 +2207,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 208px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 143px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 131px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 133px; }
+  .modal-body .dashboard-medium-chart {
+    width: 93px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 91px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 93px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 76px; }
+  .modal-body .dashboard-small-chart {
+    width: 63px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 51px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 53px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 53px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 6.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 51px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 58px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 29.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 11.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 42px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 56px; }
+
   .percentage {
     font-size: 14px; }
 
@@ -2333,11 +2373,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 468px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -234px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 200px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       display: none;
@@ -2347,6 +2388,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 448px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 303px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 291px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 293px; }
+  .modal-body .dashboard-medium-chart {
+    width: 213px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 211px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 213px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 196px; }
+  .modal-body .dashboard-small-chart {
+    width: 143px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 131px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 133px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 133px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 46.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 131px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 138px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 85.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 35.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 122px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 136px; }
+
   .percentage {
     font-size: 14px; }
 
@@ -2474,11 +2554,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 708px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -354px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 200px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       display: none;
@@ -2488,6 +2569,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 688px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 463px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 451px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 453px; }
+  .modal-body .dashboard-medium-chart {
+    width: 333px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 331px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 333px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 316px; }
+  .modal-body .dashboard-small-chart {
+    width: 223px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 211px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 213px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 213px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 86.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 211px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 218px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 141.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 59.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 202px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 216px; }
+
   .percentage {
     font-size: 14px; }
 
@@ -2615,11 +2735,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 948px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -474px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 235px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       font-size: 13px;
@@ -2628,6 +2749,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 808px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 623px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 611px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 493px; }
+  .modal-body .dashboard-medium-chart {
+    width: 453px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 451px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 333px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 435px; }
+  .modal-body .dashboard-small-chart {
+    width: 303px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 291px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 293px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 293px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 126.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 291px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 298px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 197.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 83.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 282px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 296px; }
+
   .percentage {
     font-size: 15px; }
 
@@ -2753,11 +2913,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 1188px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -594px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 270px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       font-size: 14px;
@@ -2766,6 +2927,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 1038px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 783px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 771px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 643px; }
+  .modal-body .dashboard-medium-chart {
+    width: 573px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 571px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 443px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 552px; }
+  .modal-body .dashboard-small-chart {
+    width: 383px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 371px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 373px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 373px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 166.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 371px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 378px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 253.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 107.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 362px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 376px; }
+
   .percentage {
     font-size: 18px; }
 
@@ -2807,16 +3007,6 @@ div.resizecontainer {
 @media (min-width: 1440px) and (max-width: 1679px) {
   div.resizecontainer {
     width: 1428px; }
-    .modal-chart-detail .modal-body {
-      max-height: none;
-      min-height: 300px;
-      padding: 5px; }
-    .modal-chart-detail .modal-dashboard-legend {
-      font-size: 15px;
-      min-height: 290px;
-      width: 150px; }
-    .modal-chart-detail .modal-inner-detail {
-      width: 1268px; }
 
   .dashboard-large-chart {
     width: 948px; }
@@ -2901,11 +3091,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 1428px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -714px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 300px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       font-size: 15px;
@@ -2914,6 +3105,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 1268px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 943px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 931px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 793px; }
+  .modal-body .dashboard-medium-chart {
+    width: 693px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 691px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 553px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 670px; }
+  .modal-body .dashboard-small-chart {
+    width: 463px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 451px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 453px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 453px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 206.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 451px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 458px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 309.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 131.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 442px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 456px; }
+
   .percentage {
     font-size: 20px; }
 
@@ -3039,11 +3269,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 1668px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -834px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 340px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       font-size: 16px;
@@ -3052,6 +3283,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 1488px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 1103px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 1091px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 933px; }
+  .modal-body .dashboard-medium-chart {
+    width: 813px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 811px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 653px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 786px; }
+  .modal-body .dashboard-small-chart {
+    width: 543px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 531px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 533px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 533px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 246.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 531px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 538px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 365.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 155.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 522px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 536px; }
+
   .percentage {
     font-size: 24px; }
 
@@ -3177,11 +3447,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 1908px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -954px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 400px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       font-size: 17px;
@@ -3190,6 +3461,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 1718px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 1263px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 1251px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 1083px; }
+  .modal-body .dashboard-medium-chart {
+    width: 933px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 931px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 763px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 902px; }
+  .modal-body .dashboard-small-chart {
+    width: 623px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 611px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 613px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 613px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 286.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 611px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 618px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 421.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 179.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 602px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 616px; }
+
   .percentage {
     font-size: 28px; }
 
@@ -3315,11 +3625,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 2148px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -1074px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 300px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       font-size: 17px;
@@ -3328,6 +3639,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 1988px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 1423px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 1411px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 1273px; }
+  .modal-body .dashboard-medium-chart {
+    width: 1053px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 1051px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 913px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 1028px; }
+  .modal-body .dashboard-small-chart {
+    width: 703px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 691px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 693px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 693px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 326.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 691px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 698px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 477.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 203.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 682px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 696px; }
+
   .percentage {
     font-size: 22px; }
 
@@ -3453,11 +3803,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 2388px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -1194px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 300px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       font-size: 17px;
@@ -3466,6 +3817,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 2228px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 1583px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 1571px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 1433px; }
+  .modal-body .dashboard-medium-chart {
+    width: 1173px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 1171px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 1033px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 1148px; }
+  .modal-body .dashboard-small-chart {
+    width: 783px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 771px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 773px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 773px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 366.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 771px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 778px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 533.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 227.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 762px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 776px; }
+
   .percentage {
     font-size: 22px; }
 
@@ -3591,11 +3981,12 @@ div.resizecontainer {
 
   .modal-chart-detail {
     width: 2628px;
+    bottom: 12.1% !important;
     left: 50%;
     margin-left: -1314px; }
     .modal-chart-detail .modal-body {
       max-height: none;
-      min-height: 300px;
+      height: 95%;
       padding: 5px; }
     .modal-chart-detail .modal-dashboard-legend {
       font-size: 17px;
@@ -3604,6 +3995,45 @@ div.resizecontainer {
     .modal-chart-detail .modal-inner-detail {
       width: 2468px; }
 
+  .modal-body .dashboard-large-chart {
+    width: 1743px; }
+    .modal-body .dashboard-large-chart .dashboard-sub-bar {
+      width: 1731px; }
+    .modal-body .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
+      width: 1593px; }
+  .modal-body .dashboard-medium-chart {
+    width: 1293px; }
+    .modal-body .dashboard-medium-chart .dashboard-sub-bar {
+      width: 1291px; }
+    .modal-body .dashboard-medium-chart .dashboard-interior-chart {
+      width: 1153px; }
+    .modal-body .dashboard-medium-chart .dashboard-medium-chart-menu {
+      left: 1268px; }
+  .modal-body .dashboard-small-chart {
+    width: 863px; }
+    .modal-body .dashboard-small-chart .dashboard-sub-bar {
+      width: 851px; }
+    .modal-body .dashboard-small-chart .dashboard-small-chart-inner {
+      width: 853px; }
+      .modal-body .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart {
+        width: 853px; }
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-subtitle-bar,
+  .modal-body .dashboard-tendency-container .dashboard-tendency-chart .dashboard-figure {
+    width: 406.5px; }
+  .modal-body .dashboard-tendency-container .dashboard-sub-bar {
+    width: 851px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart {
+    width: 858px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
+      width: 589.4px; }
+    .modal-body .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
+      width: 251.4px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-bar-chart-chart {
+    width: 842px; }
+  .modal-body .dashboard-bar-chart-container .dashboard-sub-bar {
+    width: 856px; }
+
   .percentage {
     font-size: 22px; }
 
diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css
index 6de60f6152..ce3bf45a1c 100644
--- a/js/apps/system/aardvark/frontend/scss/generated.css
+++ b/js/apps/system/aardvark/frontend/scss/generated.css
@@ -4730,45 +4730,46 @@ pre.gv-object-view {
   top: 6px; }
 
 .dashboard-large-chart {
-  margin-right: 12px;
-  position: relative; }
+  margin-right: 12px; }
   .dashboard-large-chart .dashboard-large-chart-inner {
+    padding-top: 5px;
     background-color: white;
     border-left: 5px solid #e1e1e1;
-    border-right: 5px solid #e1e1e1;
     border-top: 5px solid #e1e1e1;
-    padding-top: 5px; }
+    border-right: 5px solid #e1e1e1; }
     .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart {
-      margin-bottom: 0; }
+      margin-bottom: 0px; }
 
 .dashboard-small-chart .dashboard-small-chart-inner {
   background-color: white;
   border-left: 5px solid #e1e1e1;
-  border-right: 5px solid #e1e1e1;
-  border-top: 5px solid #e1e1e1; }
+  border-top: 5px solid #e1e1e1;
+  border-right: 5px solid #e1e1e1; }
   .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-bar rect {
-    fill-opacity: .15;
     stroke-opacity: 1;
-    stroke-width: 1px; }
+    stroke-width: 1px;
+    fill-opacity: 0.15; }
 
 .dashboard-medium-chart {
   background-color: white;
+  padding-top: 5px;
   border-left: 5px solid #e1e1e1;
+  border-top: 5px solid #e1e1e1;
   border-right: 5px solid #e1e1e1; }
   .dashboard-medium-chart:first-child {
     margin-right: 12px; }
   .dashboard-medium-chart .dashboard-interior-chart {
-    margin-bottom: 0; }
+    margin-bottom: 0px; }
   .dashboard-medium-chart .dashboard-medium-chart-menu {
     -moz-border-radius: 2px;
     -webkit-border-radius: 2px;
     border-radius: 2px;
-    border: 0 solid rgba(0, 0, 0, 0.3);
+    position: absolute;
     color: rgba(0, 0, 0, 0.3);
     cursor: pointer;
-    padding: 0 4px;
-    position: absolute;
-    z-index: 1000; }
+    z-index: 1000;
+    border: 0px solid rgba(0, 0, 0, 0.3);
+    padding: 0px 4px 0px 4px; }
   .dashboard-medium-chart .dashboard-medium-chart-menu:hover {
     color: rgba(0, 0, 0, 0.7); }
   .dashboard-medium-chart .dashboard-medium-chart-inner {
@@ -4781,8 +4782,8 @@ pre.gv-object-view {
 .dashboard-tendency-container .dashboard-tendency-chart {
   background-color: white;
   border-left: 5px solid #e1e1e1;
-  border-right: 5px solid #e1e1e1;
-  border-top: 5px solid #e1e1e1; }
+  border-top: 5px solid #e1e1e1;
+  border-right: 5px solid #e1e1e1; }
   .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency {
     background-color: white;
     padding: 0px 8px 0px 8px;
@@ -4798,19 +4799,19 @@ pre.gv-object-view {
 .dashboard-bar-chart-container .dashboard-bar-chart {
   background-color: white;
   border-left: 5px solid #e1e1e1;
-  border-right: 5px solid #e1e1e1;
-  border-top: 5px solid #e1e1e1; }
+  border-top: 5px solid #e1e1e1;
+  border-right: 5px solid #e1e1e1; }
   .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title {
-    margin-top: 5px;
-    padding: 0 8px; }
+    padding: 0px 8px 0px 8px;
+    margin-top: 5px; }
     .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage {
       font-weight: 400; }
     .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut {
       text-align: right; }
   .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-chart .nv-bar rect {
-    fill-opacity: .15;
     stroke-opacity: 1;
-    stroke-width: 1px; }
+    stroke-width: 1px;
+    fill-opacity: 0.15; }
 
 .dashboard-legend .dashboard-legend-inner {
   padding: 0 5px 5px 0; }
@@ -4824,10 +4825,10 @@ pre.gv-object-view {
   padding: 0px 6px 0px 6px; }
 
 .dashboard-spacer {
-  margin: 0 12px; }
+  margin: 0px 12px 0px 12px; }
 
 .headerBar.dashboard-headerbar {
-  margin: 15px 0 10px; }
+  margin: 15px 0px 10px 0px; }
 
 .modal-chart-detail .modal-dashboard-legend .dashboard-legend-inner {
   padding-left: 20px;
@@ -4843,7 +4844,8 @@ pre.gv-object-view {
   font-weight: 400;
   height: 30px;
   line-height: 30px;
-  padding: 0 5px 0 10px; }
+  /* margin: 0px -1px 0px -1px; */
+  padding: 0px 5px 0px 10px; }
   .dashboard-title-bar .dashboard-half-title-bar {
     border-left: 1px solid black;
     margin-left: -1px;
@@ -4853,9 +4855,9 @@ pre.gv-object-view {
       margin-left: 0; }
 
 .dashboard-row {
-  margin-bottom: 0;
-  margin-left: 0;
-  margin-right: 0; }
+  margin-bottom: 0px;
+  margin-left: 0px;
+  margin-right: 0px; }
 
 .dygraph-axis-label.dygraph-axis-label-y, .dygraph-axis-label.dygraph-axis-label-x {
   color: #666666; }