diff --git a/src/panel/graph_panel/partials/new_analytic_unit_5.x.html b/src/panel/graph_panel/partials/new_analytic_unit_5.x.html
index d072cd2..3b129b6 100644
--- a/src/panel/graph_panel/partials/new_analytic_unit_5.x.html
+++ b/src/panel/graph_panel/partials/new_analytic_unit_5.x.html
@@ -8,17 +8,4 @@
   <div class="gf-form-query-content">
     <ng-include src="ctrl.partialsPath + '/new_analytic_unit.html'"></ng-include>
   </div>
-
-  <label class="gf-form-label">
-    <a class="pointer" ng-click="ctrl.cancelCreation()">
-      Cancel
-    </a>
-  </label>
-  
-  <label class="gf-form-label">
-    <a class="pointer" ng-click="ctrl.saveNew()">
-      <b ng-if="!ctrl.analyticsController.saving"> Create </b>
-      <b ng-if="ctrl.analyticsController.saving" ng-disabled="true"> Saving... </b>
-    </a>
-  </label>
 </div>
diff --git a/src/panel/graph_panel/partials/new_analytic_unit_6.x.html b/src/panel/graph_panel/partials/new_analytic_unit_6.x.html
index adf15b6..84b9488 100644
--- a/src/panel/graph_panel/partials/new_analytic_unit_6.x.html
+++ b/src/panel/graph_panel/partials/new_analytic_unit_6.x.html
@@ -6,21 +6,6 @@
 
     <div class="query-editor-row__collapsed-text">
     </div>
-    
-    <div class="query-editor-row__actions">
-      <button class="query-editor-row__action">
-        <a class="pointer" ng-click="ctrl.cancelCreation()">
-          Cancel
-        </a>
-      </button>
-      
-      <button class="query-editor-row__action">
-        <a class="pointer" ng-click="ctrl.saveNew()">
-          <b ng-if="!ctrl.analyticsController.saving"> Create </b>
-          <b ng-if="ctrl.analyticsController.saving" ng-disabled="true"> Saving... </b>
-        </a>
-      </button>
-    </div>
   </div>
 
   <div class="query-editor-row__body gf-form-query">
diff --git a/src/panel/graph_panel/partials/tab_analytics.html b/src/panel/graph_panel/partials/tab_analytics.html
index 6538aa4..edf4889 100644
--- a/src/panel/graph_panel/partials/tab_analytics.html
+++ b/src/panel/graph_panel/partials/tab_analytics.html
@@ -28,16 +28,42 @@
     >
     </ng-include>
 
-    <div class="gf-form-button-row">
+    <div class="gf-form-button-row" ng-if="!ctrl.analyticsController.creatingNew">
       <button
         class="btn btn-secondary width-12"
         ng-click="ctrl.createNew()"
-        ng-disabled="ctrl.analyticsController.creatingNew"
       >
         <i class="fa fa-plus"></i>
         Add Analytic Unit
       </button>
     </div>
+    <div class="gf-form-button-row" ng-if="ctrl.analyticsController.creatingNew">
+      <button
+        class="btn btn-secondary width-12"
+        ng-click="ctrl.saveNew()"
+        ng-if="!ctrl.analyticsController.saving"
+      >
+        <i class="fa fa-plus"></i>
+        Create
+      </button>
+      <button
+        class="btn btn-secondary width-12"
+        ng-click="ctrl.saveNew()"
+        ng-if="ctrl.analyticsController.saving"
+        ng-disabled="true"
+      >
+        <i class="fa fa-spin fa-spinner"></i>
+        Saving
+      </button>
+      <button
+        class="btn btn-danger width-12"
+        ng-click="ctrl.cancelCreation()"
+        ng-disabled="ctrl.analyticsController.saving"
+      >
+        <i class="fa fa-ban"></i>
+        Cancel
+      </button>
+    </div>
     <div class="gf-form-button-row" ng-if="ctrl.analyticsController.analyticUnits.length > 0">
       <button class="gf-form-label width-12 pointer" ng-click="ctrl.redetectAll()">
         Re-detect all analytic units