diff --git a/frontend/src/components/ObservationEntry.vue b/frontend/src/components/ObservationEntry.vue
index 094a504..e3f2d38 100644
--- a/frontend/src/components/ObservationEntry.vue
+++ b/frontend/src/components/ObservationEntry.vue
@@ -3,7 +3,7 @@
     <b-row>
       <b-col cols="3">
         <p>{{ description }}</p>
-        <h4 v-bind:class="{ scorewarn: rating < 3 }">
+        <h4 v-bind:class="{ scorewarn: rating < 3}" v-if="rating > 0">
           {{ rating }}
         </h4>
       </b-col>
diff --git a/frontend/src/components/ScoreSelector.vue b/frontend/src/components/ScoreSelector.vue
index 016c883..d13c53f 100644
--- a/frontend/src/components/ScoreSelector.vue
+++ b/frontend/src/components/ScoreSelector.vue
@@ -8,7 +8,7 @@
       invalid-feedback="Please select a score."
       required
     >
-      <b-form-radio button-variant="0" value=null>&nbsp;</b-form-radio>
+      <b-form-radio button-variant="0" value="0">&nbsp;</b-form-radio>
       <b-form-radio button-variant="1" value="1">1</b-form-radio>
       <b-form-radio button-variant="2" value="2">2</b-form-radio>
       <b-form-radio button-variant="3" value="3">3</b-form-radio>
diff --git a/frontend/src/views/ViewObservations.vue b/frontend/src/views/ViewObservations.vue
index e9e6ef6..1c44b5b 100644
--- a/frontend/src/views/ViewObservations.vue
+++ b/frontend/src/views/ViewObservations.vue
@@ -148,102 +148,99 @@
             </b-row>
             <br />
             <b-row class="mb-2">
-              <b-col class="centered-image" v-if="observation.monitoring">
+              <b-col class="centered-image">
                 <img
                   src="../assets/Monitoring.svg"
                   class="image-opacity"
-                  v-bind:class="{ scorewarning: observation.monitoring < 2.5 }"
+                  v-bind:class="{ scorewarning: observation.monitoring < 2.5 && observation.monitoring > 0}"
                 />
-                <div class="image-centered-text">
+                <div class="image-centered-text" v-if="observation.monitoring > 0">
                   {{ observation.monitoring.toFixed(1) }}
                 </div>
               </b-col>
               <b-col
                 class="centered-image"
-                v-if="observation.controlProcedural"
               >
                 <img
                   src="../assets/Control.svg"
                   class="image-opacity"
                   v-bind:class="{
-                    scorewarning: observation.controlProcedural < 2.5
+                    scorewarning: observation.controlProcedural < 2.5 && observation.controlProcedural > 0
                   }"
                 />
-                <div class="image-centered-text">
+                <div class="image-centered-text" v-if="observation.controlProcedural > 0">
                   {{ observation.controlProcedural.toFixed(1) }}
                 </div>
               </b-col>
-              <b-col class="centered-image" v-if="observation.control">
+              <b-col class="centered-image">
                 <img
                   src="../assets/Control.svg"
                   class="image-opacity"
-                  v-bind:class="{ scorewarning: observation.control < 2.5 }"
+                  v-bind:class="{ scorewarning: observation.control < 2.5 && observation.control > 0}"
                 />
-                <div class="image-centered-text">
+                <div class="image-centered-text" v-if="observation.control > 0">
                   {{ observation.control.toFixed(1) }}
                 </div>
               </b-col>
-              <b-col class="centered-image" v-if="observation.conservatism">
+              <b-col class="centered-image">
                 <img
                   src="../assets/Conservatism.svg"
                   class="image-opacity"
                   v-bind:class="{
-                    scorewarning: observation.conservatism < 2.5
+                    scorewarning: observation.conservatism < 2.5 && observation.conservatism > 0
                   }"
                 />
-                <div class="image-centered-text">
+                <div class="image-centered-text" v-if="observation.conservatism > 0">
                   {{ observation.conservatism.toFixed(1) }}
                 </div>
               </b-col>
               <b-col
                 class="centered-image"
-                v-if="observation.teamworkCommunications"
               >
                 <img
                   src="../assets/Teamwork.svg"
                   class="image-opacity"
                   v-bind:class="{
-                    scorewarning: observation.teamworkCommunications < 2.5
+                    scorewarning: observation.teamworkCommunications < 2.5 && observation.teamworkCommunications > 0
                   }"
                 />
-                <div class="image-centered-text">
+                <div class="image-centered-text" v-if="observation.teamworkCommunications > 0">
                   {{ observation.teamworkCommunications.toFixed(1) }}
                 </div>
               </b-col>
               <b-col
                 class="centered-image"
-                v-if="observation.teamworkLeadership"
               >
                 <img
                   src="../assets/Teamwork.svg"
                   class="image-opacity"
                   v-bind:class="{
-                    scorewarning: observation.teamworkLeadership < 2.5
+                    scorewarning: observation.teamworkLeadership < 2.5 && observation.teamworkLeadership > 0
                   }"
                 />
-                <div class="image-centered-text">
+                <div class="image-centered-text" v-if="observation.teamworkLeadership > 0">
                   {{ observation.teamworkLeadership.toFixed(1) }}
                 </div>
               </b-col>
-              <b-col class="centered-image" v-if="observation.teamworkWorkload">
+              <b-col class="centered-image">
                 <img
                   src="../assets/Teamwork.svg"
                   class="image-opacity"
                   v-bind:class="{
-                    scorewarning: observation.teamworkWorkload < 2.5
+                    scorewarning: observation.teamworkWorkload < 2.5 && observation.teamworkWorkload > 0
                   }"
                 />
-                <div class="image-centered-text">
+                <div class="image-centered-text" v-if="observation.teamworkWorkload > 0">
                   {{ observation.teamworkWorkload.toFixed(1) }}
                 </div>
               </b-col>
-              <b-col class="centered-image" v-if="observation.knowledge">
+              <b-col class="centered-image">
                 <img
                   src="../assets/Knowledge.svg"
                   class="image-opacity"
-                  v-bind:class="{ scorewarning: observation.knowledge < 2.5 }"
+                  v-bind:class="{ scorewarning: observation.knowledge < 2.5 && observation.knowledge > 0 }"
                 />
-                <div class="image-centered-text">
+                <div class="image-centered-text" v-if="observation.knowledge > 0">
                   {{ observation.knowledge.toFixed(1) }}
                 </div>
               </b-col>