diff --git a/config-validator-ui-concept/index.html b/config-validator-ui-concept/index.html
index 5f0e039..4576879 100644
--- a/config-validator-ui-concept/index.html
+++ b/config-validator-ui-concept/index.html
@@ -30,7 +30,7 @@
             <h2 class="ui header">
                 <i class="circular emphasized bug icon"></i>
                 <div class="content">
-                    OpenStack Config Validator
+                    OpenStack Diagnostics
                     <div class="sub header">
                         A real-time validator of consistency and correctness of
                         OpenStack configuration files.
diff --git a/config-validator-ui-concept/partials/main.html b/config-validator-ui-concept/partials/main.html
index 6d324a4..cc55abc 100644
--- a/config-validator-ui-concept/partials/main.html
+++ b/config-validator-ui-concept/partials/main.html
@@ -129,7 +129,7 @@
                         <div class="ui error message">
                             <div class="header">We noticed some issues</div>
                         </div>
-                        <div class="ui blue submit button">Test Connection</div>
+                        <!--<div class="ui blue submit button">Test Connection</div>-->
                     </div>
 
                 </div>
@@ -196,16 +196,18 @@
             </div>
         </div>
 
-        <div class="ui feed segment" ng-show="diagnosticsFinished">
-            <h2 class="ui header">
-                Diagnostics Results
-            </h2>
+        <h2>Diagnostics Results</h2>
+
+        <div class="ui feed segment" ng-show="diagnosticsFinished"  ng-repeat="host in results.hosts">
+            <h4 class="ui header">
+                {{host.name}}
+            </h4>
 
             <div>
                 <small>Show only components with issues:</small> <input type="checkbox" ng-model="componentFilter">
             </div>
 
-            <div ng-repeat="host in results.hosts">
+            <div>
 
                 <div class="event" ng-repeat="component in host.components" ng-show="toggleEmptyComponents(component)">
                     <div class="label">