diff --git a/src/panel/graph_panel/partials/analytic_units_5.x.html b/src/panel/graph_panel/partials/analytic_units_5.x.html
index e8478ca..9f77e85 100644
--- a/src/panel/graph_panel/partials/analytic_units_5.x.html
+++ b/src/panel/graph_panel/partials/analytic_units_5.x.html
@@ -9,31 +9,34 @@
         <span class="gf-form-query-letter-cell-letter">{{analyticUnit.name}}</span>
         <em class="gf-form-query-letter-cell-ds" ng-show="analyticUnit.id">({{analyticUnit.id}})</em>
       </a>
-      &nbsp;
-      <i ng-if="analyticUnit.status === 'READY'"
-        class="fa fa-check-circle"
-        bs-tooltip="'Ready'"
-      ></i>
-      <i ng-if="analyticUnit.status === 'SUCCESS'"
-        class="fa fa-check"
-        bs-tooltip="'Learning succeeded'"
-      ></i>
-      <i ng-if="analyticUnit.status === 'LEARNING'"
-        class="fa fa-leanpub"
-        bs-tooltip="'Learning'"
-      ></i>
-      <i ng-if="analyticUnit.status === 'DETECTION'"
-        class="fa fa-search"
-        bs-tooltip="'Detection'"
-      ></i>
-      <i ng-if="analyticUnit.status === 'PENDING'"
-        class="fa fa-list-ul"
-        bs-tooltip="'Pending'"
-      ></i>
-      <i ng-if="analyticUnit.status === 'FAILED'"
-        class="fa fa-exclamation-circle"
-        bs-tooltip="'Error: ' + analyticUnit.error"
-      ></i>
+
+      <span style="cursor: default;">
+        &nbsp;
+        <i ng-if="analyticUnit.status === 'READY'"
+          class="fa fa-check-circle"
+          bs-tooltip="'Ready'"
+        ></i>
+        <i ng-if="analyticUnit.status === 'SUCCESS'"
+          class="fa fa-check"
+          bs-tooltip="'Learning succeeded'"
+        ></i>
+        <i ng-if="analyticUnit.status === 'LEARNING'"
+          class="fa fa-leanpub"
+          bs-tooltip="'Learning'"
+        ></i>
+        <i ng-if="analyticUnit.status === 'DETECTION'"
+          class="fa fa-search"
+          bs-tooltip="'Detection'"
+        ></i>
+        <i ng-if="analyticUnit.status === 'PENDING'"
+          class="fa fa-list-ul"
+          bs-tooltip="'Pending'"
+        ></i>
+        <i ng-if="analyticUnit.status === 'FAILED'"
+          class="fa fa-exclamation-circle"
+          bs-tooltip="'Error: ' + analyticUnit.error"
+        ></i>
+      </span>
     </label>
   </div>
 
diff --git a/src/panel/graph_panel/partials/analytic_units_6.x.html b/src/panel/graph_panel/partials/analytic_units_6.x.html
index 8e90766..56959c8 100644
--- a/src/panel/graph_panel/partials/analytic_units_6.x.html
+++ b/src/panel/graph_panel/partials/analytic_units_6.x.html
@@ -1,36 +1,39 @@
 <div class="query-editor-row" ng-repeat="analyticUnit in ctrl.analyticsController.analyticUnits">
   <div class="query-editor-row__header">
-    <div class="query-editor-row__ref-id width-25" ng-click="ctrl.onToggleCollapsed(analyticUnit.id)">
+    <div class="query-editor-row__ref-id" ng-click="ctrl.onToggleCollapsed(analyticUnit.id)">
       <i class="fa fa-fw fa-caret-down" ng-hide="analyticUnit.collapsed"></i>
       <i class="fa fa-fw fa-caret-right" ng-show="analyticUnit.collapsed"></i>
       <span>{{analyticUnit.name}}</span>
       <em class="query-editor-row__context-info">({{analyticUnit.id}})</em>
+
+      <span style="cursor: default;">
+        &nbsp;
+        <i ng-if="analyticUnit.status === 'READY'"
+          class="fa fa-fw fa-check-circle"
+          bs-tooltip="'Ready'"
+        ></i>
+        <i ng-if="analyticUnit.status === 'SUCCESS'"
+          class="fa fa-fw fa-check"
+          bs-tooltip="'Learning succeeded'"
+        ></i>
+        <i ng-if="analyticUnit.status === 'LEARNING'"
+          class="fa fa-fw fa-leanpub"
+          bs-tooltip="'Learning'"
+        ></i>
+        <i ng-if="analyticUnit.status === 'DETECTION'"
+          class="fa fa-fw fa-search"
+          bs-tooltip="'Detection'"
+        ></i>
+        <i ng-if="analyticUnit.status === 'PENDING'"
+          class="fa fa-fw fa-list-ul"
+          bs-tooltip="'Pending'"
+        ></i>
+        <i ng-if="analyticUnit.status === 'FAILED'"
+          class="fa fa-fw fa-exclamation-circle"
+          bs-tooltip="'Error: ' + analyticUnit.error"
+        ></i>
+      </span>
     </div>
-    &nbsp;
-    <i ng-if="analyticUnit.status === 'READY'"
-      class="fa fa-fw fa-check-circle"
-      bs-tooltip="'Ready'"
-    ></i>
-    <i ng-if="analyticUnit.status === 'SUCCESS'"
-      class="fa fa-fw fa-check"
-      bs-tooltip="'Learning succeeded'"
-    ></i>
-    <i ng-if="analyticUnit.status === 'LEARNING'"
-      class="fa fa-fw fa-leanpub"
-      bs-tooltip="'Learning'"
-    ></i>
-    <i ng-if="analyticUnit.status === 'DETECTION'"
-      class="fa fa-fw fa-search"
-      bs-tooltip="'Detection'"
-    ></i>
-    <i ng-if="analyticUnit.status === 'PENDING'"
-      class="fa fa-fw fa-list-ul"
-      bs-tooltip="'Pending'"
-    ></i>
-    <i ng-if="analyticUnit.status === 'FAILED'"
-      class="fa fa-fw fa-exclamation-circle"
-      bs-tooltip="'Error: ' + analyticUnit.error"
-    ></i>
 
     <div class="query-editor-row__collapsed-text">
     </div>