diff --git a/public/less/angular-md.less b/public/less/angular-md.less
index 3e0de4e5a4..7cd58a6534 100644
--- a/public/less/angular-md.less
+++ b/public/less/angular-md.less
@@ -27,11 +27,6 @@ md-card-content .ng-binding {
     color: white;
 }
 
-.fa-search-plus,
-.fa-search-minus {
-    font-size: initial !important;
-}
-
 .md-input-margin {
     margin: 18px 20px 0 0
 }
diff --git a/public/less/kbn.less b/public/less/kbn.less
index a5fc3c6109..e36b85da80 100644
--- a/public/less/kbn.less
+++ b/public/less/kbn.less
@@ -125,3 +125,13 @@ kbn-vis, visualize, visualization {
      padding: 4px 10px 0 !important;
      background-color: #e4e4e4 !important;
  }
+
+
+mark {
+  background-color: #45A19A !important;
+  color: white !important;
+}
+
+table>thead>tr>th {
+  border-bottom: 0px !important;
+}
\ No newline at end of file
diff --git a/public/templates/agents-general.html b/public/templates/agents-general.html
index f0f3fa259b..49fc15860a 100644
--- a/public/templates/agents-general.html
+++ b/public/templates/agents-general.html
@@ -18,13 +18,20 @@
                     <div class="ng-binding">IP Address</div>
                 </md-card-content>
             </md-card>
-            <md-card flex="12">
+            <md-card ng-if="agent.version" flex="12">
                 <md-card-content class="agents-overview-top-metric-item">
                     <div class="metric-value ng-binding agents-overview-size-14">{{ agent.version | limitTo: 12 }}{{agent.version.length > 12 ? '...' : ''}}</div>
                     <!--<md-tooltip md-direction="bottom">{{ agent.version }}</md-tooltip>-->
                     <div class="ng-binding">Version</div>
                 </md-card-content>
             </md-card>
+            <md-card ng-if="agent.group" flex="12">
+                <md-card-content class="agents-overview-top-metric-item" >
+                    <div class="metric-value ng-binding agents-overview-size-14" >{{ agent.group }}</div>
+                    <!--<md-tooltip md-direction="bottom">{{ agent.version }}</md-tooltip>-->
+                    <div class="ng-binding">Group</div>
+                </md-card-content>
+            </md-card>
             <md-card flex>
                 <md-card-content class="agents-overview-top-metric-item">
                     <div class="metric-value ng-binding legend-value-truncate agents-overview-size-14">{{ agentOS }}</div>
@@ -37,7 +44,7 @@
         <div layout="row" class="agents-overview-second-row">
             <md-card flex ng-show="agent.id != '000'">
                 <md-card-content class="agents-overview-top-metric-item">
-                    <div class="metric-value ng-binding agents-overview-size-14">{{agent.lastKeepAlive}}</div>
+                    <div class="metric-value ng-binding agents-overview-size-14">{{agent.lastKeepAlive || 'Unknown' }}</div>
                     <!--<md-tooltip md-direction="bottom">{{ agent.lastKeepAlive }}</md-tooltip>-->
                     <div class="ng-binding">Last keep alive</div>
                 </md-card-content>