diff --git a/ui/index.html b/ui/index.html
index c414aa0f21..fb662d5481 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -442,9 +442,17 @@
 
           <div class="panel-body">
             <h5>Notes</h5>
-            <p>{{ check.Notes }}</p>
+            {{#if check.Notes}}
+              <p>{{ check.Notes }}</p>
+            {{else}}
+              <p>No notes</p>
+            {{/if}}
             <h5>Output</h5>
+            {{#if check.Output }}
             <pre>{{check.Output}}</pre>
+            {{else}}
+            <pre>No output</pre>
+            {{/if}}
           </div>
         </div>
 
diff --git a/ui/styles/_panels.scss b/ui/styles/_panels.scss
index 9d87b55b5c..3964482c70 100644
--- a/ui/styles/_panels.scss
+++ b/ui/styles/_panels.scss
@@ -31,6 +31,7 @@
     }
 
     .panel-body {
+        padding: 0px 15px 0px 15px;
         p {
             font-size: 14px;
             color: $text-color;