diff --git a/httpdocs/public/assets/js/my-bim-score.js b/httpdocs/public/assets/js/my-bim-score.js
index a03be19..915bd73 100644
--- a/httpdocs/public/assets/js/my-bim-score.js
+++ b/httpdocs/public/assets/js/my-bim-score.js
@@ -169,7 +169,10 @@ function onCalculate() {
                     $('#resInspection').text(data['recCycleInspection']);
                     $('#resMaintenance').text(data['recCycleMaintenance']);
                     $('#resPercentage').text((data['costDiffCurRecPercentage'] * 100) + " %");
-                    $('#resEuro').text(data['costDiffCurCycleRecCycle'].toString().replace(/\./g, ",") + " €");
+                    let costDiff = data['costDiffCurCycleRecCycle'];
+                    let roundedCostDiff = parseFloat(costDiff).toFixed(2);
+                    $('#resEuro').text(roundedCostDiff.replace(/\./g, ",") + " €");
+                    $("#result-box").addClass("result-existing");
                     $('html, body').animate({
                         scrollTop: $('#result-box').offset().top - 200
                     }, 500);
diff --git a/httpdocs/public/assets/scss/components/_basic.scss b/httpdocs/public/assets/scss/components/_basic.scss
index 5ffbd35..a38fb5f 100644
--- a/httpdocs/public/assets/scss/components/_basic.scss
+++ b/httpdocs/public/assets/scss/components/_basic.scss
@@ -457,11 +457,11 @@ textarea:-ms-input-placeholder {
       }
     }
     dt {
-      flex-basis: 80%;
+      flex-basis: 75%;
       font-weight: normal;
     }
     dd {
-      flex-basis: 20%;
+      flex-basis: 25%;
       font-weight: bold;
       text-align: right;
     }
@@ -472,4 +472,18 @@ textarea:-ms-input-placeholder {
   .btn {
     margin: 0 auto;
   }
+  .result-existing {
+    display: none;
+  }
+  .result-not-existing {
+    display: block;
+  }
+  &.result-existing {
+    .result-existing {
+      display: block;
+    }
+    .result-not-existing {
+      display: none;
+    }
+  }
 }
diff --git a/httpdocs/public/assets/scss/styles.css b/httpdocs/public/assets/scss/styles.css
index fc5a333..d2c73cd 100644
--- a/httpdocs/public/assets/scss/styles.css
+++ b/httpdocs/public/assets/scss/styles.css
@@ -660,11 +660,11 @@ textarea:-ms-input-placeholder {
   border-bottom: none;
 }
 .result-box dl dt {
-  flex-basis: 80%;
+  flex-basis: 75%;
   font-weight: normal;
 }
 .result-box dl dd {
-  flex-basis: 20%;
+  flex-basis: 25%;
   font-weight: bold;
   text-align: right;
 }
@@ -674,6 +674,18 @@ textarea:-ms-input-placeholder {
 .result-box .btn {
   margin: 0 auto;
 }
+.result-box .result-existing {
+  display: none;
+}
+.result-box .result-not-existing {
+  display: block;
+}
+.result-box.result-existing .result-existing {
+  display: block;
+}
+.result-box.result-existing .result-not-existing {
+  display: none;
+}
 
 header {
   box-shadow: 0 1px 10px -6px rgba(0, 0, 0, 0.42), 0 1px 10px 0 rgba(0, 0, 0, 0.12), 0 4px 5px -2px rgba(0, 0, 0, 0.1);
diff --git a/httpdocs/public/assets/scss/styles.css.map b/httpdocs/public/assets/scss/styles.css.map
index 44d9483..27300fb 100644
--- a/httpdocs/public/assets/scss/styles.css.map
+++ b/httpdocs/public/assets/scss/styles.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["components/_reset.scss","_variables.scss","components/_basic.scss","_mixins.scss","components/_header.scss","components/_footer.scss","components/_listing.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;EACA;EACA;EACA,mWAKmE;;AAGrE;AACA;EACE;EACA;EACA;EACA;EACA,+UAK+D;;AAIjE;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;EACA;EACA;EACA;EACA;;;AAGF;AAAA;AAAA;AAAA;EAIE;;;AAIF;AAEA;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;AAEA;AAAA;AAAA;AAAA;EAIE;;;AAGF;EACE;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAyBE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;;;AAGF;AAAA;EAEE;;;AAIA;AAAA;AAAA;AAAA;EAIE;EACA;;;AAIJ;AAAA;EAEE;EACA;;;AAGF;AAAA;EAEE;EACA;;;AAGF;AAAA;EAEE;EACA;;;AAGF;AAAA;EAEE;EACA;;;AAGF;EACE,YCzKY;ED0KZ;EACA;;AACA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;AAAA;EAEE;EACA;;;AAGF;AAAA;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AE3MF;EACE;;AACA;EAFF;IAGI;;;AAEF;EALF;IAMI;;;;AAIJ;AAAA;EAEE,ODTmB;ECUnB;;;AAGF;AAAA;EAEE,ODfmB;ECgBnB;;;AAGF;AAAA;EAEE,ODrBmB;ECsBnB;;;AAGF;AAAA;EAEE,OD3BmB;EC4BnB;;;AAIA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;;AAGJ;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;;AAGJ;EACE;;AAIE;EACE;EACA;EACA;EACA;;AAIN;EACE;;AACA;EACE,ODrFU;;ACsFV;EACE;;AAEF;EACE;;AAIN;EACE;;AAGA;EACE;EACA;EACA;EACA;;AACA;EAEE;EACA;EACA;;AACA;EALF;IAMI;IACA;;;AAKF;EAFF;IAGI;;;;AAOV;EACE;EACA,YD7Hc;EC8Hd,ODlIY;ECmIZ;EACA;EACA;EACA;EACA;EACA;EACA;ECxIA;;AD0IA;EACE,YDtIW;ECuIX,cDvIW;ECwIX,OD9IU;;ACgJZ;EACE;EACA,YDjJU;ECkJV,cDlJU;ECmJV;;AAEF;EACE,YDvJU;ECwJV,ODpJY;;ACsJd;EACE,cD7Ic;EC8Id,YD9Ic;EC+Id,OD7JU;;AC8JV;EACE,YD/JQ;ECgKR,cDlJY;ECmJZ,ODnJY;;;ACyJhB;EACE;EACA;EACA;;AAEE;EADF;IAEI;;;AAGJ;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;;AACA;EAFF;IAGI;;;AAGJ;EATF;IAUI;;;AAEF;EAZF;IAaI;;;AAIF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EAPF;IAQI;;;AAEF;EAVF;IAWI;;;AAIN;EACE;;AACA;EACE;EACA;;AACA;EAHF;IAII;;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;;;AAIF;EACE;EACA;;AAIN;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;EACA;IACE;IACA;;EAEF;IACE;IACA;IACA;IACA;;EACA;IACE;;EAGJ;IACE;IACA;;;AAIN;EACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;;AACA;EAHF;IAII;IACA;;;AAIF;EACE;;AACA;EACE;EACA;EACA;;AACA;EAJF;IAKI;;;AAMV;EACE;EACA;;AAEF;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,ODnYY;ECoYZ;;AACA;EACE;;AAEF;EACE,YDrYY;;ACuYd;EACE;;;AAIJ;AAEA;EACE;EACA;EACA;;AACA;EACE;;AACA;EACE;;AAEF;EACE;;;AAMJ;EACE;;AACA;EACE;;;AAKN;EACE;;AACA;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;EACA;;AAGJ;EACE;;AAEF;EACE;;;AExdJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA,YHPY;;AGQZ;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;IACA;;;AAEF;EATF;IAUI;IACA;;;AAEF;EAbF;IAcI;;;AAEF;EACE;;AACA;EAFF;IAGI;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EANF;IAOI;IACA;;;AAEF;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;;AAGJ;EACE;;AAKJ;EADF;IAEI;;;AAIN;EACE;;AACA;EAFF;IAGI;;;AAGJ;EACE;;AClEJ;EACE;EACA,OJFY;;AIGZ;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;;AAEF;EACE;;;AChBN;EACE;;;AAOA;EACE,YLIW;EKHX;EACA;;AACA;EACE,YLDS;;AKGX;EACE;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACA;EAFF;IAGI;IACA;IACA;;;AAGJ;EACE;;AACA;EAFF;IAGI;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEE;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAOZ;EACE;;AAKF;EACE","file":"styles.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["components/_reset.scss","_variables.scss","components/_basic.scss","_mixins.scss","components/_header.scss","components/_footer.scss","components/_listing.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;EACA;EACA;EACA,mWAKmE;;AAGrE;AACA;EACE;EACA;EACA;EACA;EACA,+UAK+D;;AAIjE;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;EACA;EACA;EACA;EACA;;;AAGF;AAAA;AAAA;AAAA;EAIE;;;AAIF;AAEA;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;AAEA;AAAA;AAAA;AAAA;EAIE;;;AAGF;EACE;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAyBE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;;;AAGF;AAAA;EAEE;;;AAIA;AAAA;AAAA;AAAA;EAIE;EACA;;;AAIJ;AAAA;EAEE;EACA;;;AAGF;AAAA;EAEE;EACA;;;AAGF;AAAA;EAEE;EACA;;;AAGF;AAAA;EAEE;EACA;;;AAGF;EACE,YCzKY;ED0KZ;EACA;;AACA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;AAAA;EAEE;EACA;;;AAGF;AAAA;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AE3MF;EACE;;AACA;EAFF;IAGI;;;AAEF;EALF;IAMI;;;;AAIJ;AAAA;EAEE,ODTmB;ECUnB;;;AAGF;AAAA;EAEE,ODfmB;ECgBnB;;;AAGF;AAAA;EAEE,ODrBmB;ECsBnB;;;AAGF;AAAA;EAEE,OD3BmB;EC4BnB;;;AAIA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;;AAGJ;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;;AAGJ;EACE;;AAIE;EACE;EACA;EACA;EACA;;AAIN;EACE;;AACA;EACE,ODrFU;;ACsFV;EACE;;AAEF;EACE;;AAIN;EACE;;AAGA;EACE;EACA;EACA;EACA;;AACA;EAEE;EACA;EACA;;AACA;EALF;IAMI;IACA;;;AAKF;EAFF;IAGI;;;;AAOV;EACE;EACA,YD7Hc;EC8Hd,ODlIY;ECmIZ;EACA;EACA;EACA;EACA;EACA;EACA;ECxIA;;AD0IA;EACE,YDtIW;ECuIX,cDvIW;ECwIX,OD9IU;;ACgJZ;EACE;EACA,YDjJU;ECkJV,cDlJU;ECmJV;;AAEF;EACE,YDvJU;ECwJV,ODpJY;;ACsJd;EACE,cD7Ic;EC8Id,YD9Ic;EC+Id,OD7JU;;AC8JV;EACE,YD/JQ;ECgKR,cDlJY;ECmJZ,ODnJY;;;ACyJhB;EACE;EACA;EACA;;AAEE;EADF;IAEI;;;AAGJ;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;;AACA;EAFF;IAGI;;;AAGJ;EATF;IAUI;;;AAEF;EAZF;IAaI;;;AAIF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EAPF;IAQI;;;AAEF;EAVF;IAWI;;;AAIN;EACE;;AACA;EACE;EACA;;AACA;EAHF;IAII;;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;;;AAIF;EACE;EACA;;AAIN;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;EACA;IACE;IACA;;EAEF;IACE;IACA;IACA;IACA;;EACA;IACE;;EAGJ;IACE;IACA;;;AAIN;EACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;;AACA;EAHF;IAII;IACA;;;AAIF;EACE;;AACA;EACE;EACA;EACA;;AACA;EAJF;IAKI;;;AAMV;EACE;EACA;;AAEF;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,ODnYY;ECoYZ;;AACA;EACE;;AAEF;EACE,YDrYY;;ACuYd;EACE;;;AAIJ;AAEA;EACE;EACA;EACA;;AACA;EACE;;AACA;EACE;;AAEF;EACE;;;AAMJ;EACE;;AACA;EACE;;;AAKN;EACE;;AACA;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;EACA;;AAGJ;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAGA;EACE;;AAEF;EACE;;;AEreN;EACE;EACA;EACA;EACA;EACA;EACA;EACA,YHPY;;AGQZ;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;IACA;;;AAEF;EATF;IAUI;IACA;;;AAEF;EAbF;IAcI;;;AAEF;EACE;;AACA;EAFF;IAGI;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EANF;IAOI;IACA;;;AAEF;EACE;EACA;EACA;;AACA;EAJF;IAKI;IACA;;;AAGJ;EACE;;AAKJ;EADF;IAEI;;;AAIN;EACE;;AACA;EAFF;IAGI;;;AAGJ;EACE;;AClEJ;EACE;EACA,OJFY;;AIGZ;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;;AAEF;EACE;;;AChBN;EACE;;;AAOA;EACE,YLIW;EKHX;EACA;;AACA;EACE,YLDS;;AKGX;EACE;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EALF;IAMI;;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACA;EAFF;IAGI;IACA;IACA;;;AAGJ;EACE;;AACA;EAFF;IAGI;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEE;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAOZ;EACE;;AAKF;EACE","file":"styles.css"}
\ No newline at end of file
diff --git a/httpdocs/src/Service/CalculatorService.php b/httpdocs/src/Service/CalculatorService.php
index 063fd6f..51048ef 100644
--- a/httpdocs/src/Service/CalculatorService.php
+++ b/httpdocs/src/Service/CalculatorService.php
@@ -30,7 +30,7 @@ class CalculatorService
         $riskFactor = Utils::$riskPoints[$riskPoints]['factor'];
 
         $recCycleMaintenance = $asset->getCycleMonthsMax();
-        if ((int)($params['maintenance']) === 1 && ((int)$params['check']) === 1 ) {
+        if ((int)($params['maintenance']) === 1 || ((int)$params['check']) === 1 ) {
             $recCycleMaintenance = (int) ($asset->getCycleMonthsMax() * $riskFactor);
             if ($recCycleMaintenance < $asset->getCycleMonthsMin()) {
                 $recCycleMaintenance = $asset->getCycleMonthsMin();
diff --git a/httpdocs/templates/pages/risk_analysis.html.twig b/httpdocs/templates/pages/risk_analysis.html.twig
index 8c12891..a24612d 100644
--- a/httpdocs/templates/pages/risk_analysis.html.twig
+++ b/httpdocs/templates/pages/risk_analysis.html.twig
@@ -100,19 +100,22 @@
             <div class="col-box">
                 <div class="result-box" id="result-box">
                     <h3>Ergebnis</h3>
-                    <dl>
-                        <dt>Inspektion<br />
-                            (empfohlener Zyklus in Monaten)</dt>
-                        <dd id="resInspection"></dd>
-                        <dt>Wartung<br />
-                            (empfohlener Zyklus in Monaten)</dt>
-                        <dd id="resMaintenance"></dd>
-                        <dt>Kostenersparnis in Prozent</dt>
-                        <dd id="resPercentage"></dd>
-                        <dt>Kostenersparnis in Euro</dt>
-                        <dd id="resEuro"></dd>
-                    </dl>
-                    <span class="btn" id="worksheet">Arbeitskarte erstellen</span>
+                    <p class="result-not-existing">Bitte erst berechnen!</p>
+                    <div class="result-existing">
+                        <dl>
+                            <dt>Inspektion<br />
+                                (empfohlener Zyklus in Monaten)</dt>
+                            <dd id="resInspection"></dd>
+                            <dt>Wartung<br />
+                                (empfohlener Zyklus in Monaten)</dt>
+                            <dd id="resMaintenance"></dd>
+                            <dt>Kostenersparnis in Prozent</dt>
+                            <dd id="resPercentage"></dd>
+                            <dt>Kostenersparnis in Euro</dt>
+                            <dd id="resEuro"></dd>
+                        </dl>
+                        <span class="btn" id="worksheet">Arbeitskarte erstellen</span>
+                    </div>
                 </div>
             </div>
         </div>