diff --git a/app/partials/updateFuelManager/updateFuelManager.controller.js b/app/partials/updateFuelManager/updateFuelManager.controller.js
index dedf132..06b8a5c 100644
--- a/app/partials/updateFuelManager/updateFuelManager.controller.js
+++ b/app/partials/updateFuelManager/updateFuelManager.controller.js
@@ -594,9 +594,10 @@
             $scope.showLoader = true;
             for (var i = 0; i<$scope.newFuelPricing.length; i++) {
                 //console.log(parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin));
+                console.log('-----',$scope.newFuelPricing[i].futureFuelPricing);
                 if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                     if ($scope.newFuelPricing[i].futureFuelPricing.cost != null || $scope.newFuelPricing[i].futureFuelPricing.cost != '' || $scope.newFuelPricing[i].futureFuelPricing.cost != undefined) {
-                        $scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
+                        $scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].futureFuelPricing.papMargin);
                         if ($scope.newFuelPricing[i].futureFuelPricing.cost == null) {
                             $scope.newFuelPricing[i].futureFuelPricing.cost = '';
                         }
@@ -870,6 +871,34 @@
             $('#deleteVtypeMargin').css('display', 'none');
         }
 
+        $scope.resetFutureFuelPricingClick = function(){
+            $('#resetPricing').css('display', 'block');
+        }
+
+        $scope.confirmReset = function(){
+            $('#resetPricing').css('display', 'none');
+            $scope.showLoader = true;
+            updateFuelManagerService.resetPricing().then(function(result) {
+                toastr.success(''+result.success+'', {
+                  closeButton: true
+                })
+                $scope.showLoader = false;
+            })
+        }
+
+        $scope.cancelReset = function(){
+            $('#resetPricing').css('display', 'none');
+        }
+        $scope.noPrices = true;
+        $scope.disableButtons = function(value){
+           if(value.length != 0){
+             $scope.noPrices = false;
+           }
+           else{
+              $scope.noPrices = true;
+           }
+        }
+
        
 
 
diff --git a/app/partials/updateFuelManager/updateFuelManager.html b/app/partials/updateFuelManager/updateFuelManager.html
index e5c0b01..738fb35 100644
--- a/app/partials/updateFuelManager/updateFuelManager.html
+++ b/app/partials/updateFuelManager/updateFuelManager.html
@@ -43,7 +43,7 @@
                            <span  ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span>
                         </td>
                         <td>
-                           <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 50px; padding: 6px 6px;">
+                           <input type="text" class="form-control" ng-keyup="disableButtons(fuelPricing.futureFuelPricing.cost)" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 50px; padding: 6px 6px;">
                         </td>
                          <td>
                            <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.papMargin" style="height:31px; width: 80px; padding: 6px 6px;">
@@ -63,12 +63,12 @@
                <div class="row" style="margin-left: 0px;">
                   <div class="col-md-12" style= "text-align: right; padding-left: 0;">
                     <div style="float: left;">
-                      <button type="button" class="btn btn-primary btn-xs" ng-click="updateFutureFuelPricingImmediatelyClick()" style= "text-align: center;  font-size:12px">Save & Deploy Immediately</button>
+                      <button type="button" class="btn btn-primary btn-xs" ng-click="updateFutureFuelPricingImmediatelyClick()" ng-disabled="noPrices" style= "text-align: center;  font-size:12px">Save & Deploy Immediately</button>
                   
-                     <button type="reset" class="btn btn-default btn-xs">Reset All</button>
+                     <button type="button" ng-click="resetFutureFuelPricingClick()" class="btn btn-default btn-xs">Reset All</button>
                     </div>
                     <div style="float: right;">
-                      <button type="button" class="btn btn-success btn-xs" ng-click="updateFutureFuelPricingClick()" style="margin-right:3%">Save & Stage for Deploy</button>
+                      <button type="button" class="btn btn-success btn-xs" ng-click="updateFutureFuelPricingClick()" ng-disabled="noPrices" style="margin-right:3%">Save & Stage for Deploy</button>
                     </div>
                      <div style="clear: both;"></div>
                   </div>
@@ -115,16 +115,16 @@
                            <span  ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span>
                         </td>
                         <td>
-                          <span>{{fuelPricing.fuelPricing.cost}}</span>
+                          <span>{{fuelPricing.futureFuelPricing.cost}}</span>
                           </td>
                         <td>
-                          <span>{{fuelPricing.fuelPricing.papMargin}}</span>
+                          <span>{{fuelPricing.futureFuelPricing.papMargin}}</span>
                            </td>
                         <td>
-                           <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin  | number : 2 }}</span>
+                           <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.futureFuelPricing.papMargin  | number : 2 }}</span>
                         </td>
                         <td>
-                          <span>{{fuelPricing.fuelPricing.expirationDate}}</span>
+                          <span>{{fuelPricing.futureFuelPricing.expirationDate}}</span>
                         </td>
                      </tr>
                   </tbody>
@@ -483,7 +483,7 @@
                  <img src="img/info.png" style="width: 50px;">
               </td>
               <td>
-                 <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Tier ?</p>
+                 <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Tier?</p>
               </td>
            </tr>
         </table>
@@ -504,7 +504,7 @@
                  <img src="img/info.png" style="width: 50px;">
               </td>
               <td>
-                 <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Tier ?</p>
+                 <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Tier?</p>
               </td>
            </tr>
         </table>
@@ -525,7 +525,7 @@
                  <img src="img/info.png" style="width: 50px;">
               </td>
               <td>
-                 <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Margin Template ?</p>
+                 <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Margin Template?</p>
               </td>
            </tr>
         </table>
@@ -546,7 +546,7 @@
                  <img src="img/info.png" style="width: 50px;">
               </td>
               <td>
-                 <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Margin Template ?</p>
+                 <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Margin Template?</p>
               </td>
            </tr>
         </table>
@@ -558,6 +558,27 @@
   </div>
 </div>
 
+<div class="customConfirmPopBackdrop" id="resetPricing" style="display: none;">
+  <div class="customModalInner">
+     <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
+        <table>
+           <tr>
+              <td>
+                 <img src="img/info.png" style="width: 50px;">
+              </td>
+              <td>
+                 <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure you want to reset and clear all of the staged pricing above and current pricing below?</p>
+              </td>
+           </tr>
+        </table>
+     </div>
+     <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
+        <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="confirmReset()">Yes</button>
+        <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelReset()">No</button>
+     </div>
+  </div>
+</div>
+
 <!-- Le javascript
    ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
diff --git a/app/partials/updateFuelManager/updateFuelManager.service.js b/app/partials/updateFuelManager/updateFuelManager.service.js
index 8f20826..48386ea 100644
--- a/app/partials/updateFuelManager/updateFuelManager.service.js
+++ b/app/partials/updateFuelManager/updateFuelManager.service.js
@@ -291,6 +291,22 @@
           return deferred.promise;
         }
 
+         this.resetPricing = function(data){
+          var deferred = $q.defer();
+          $http({
+              method : 'DELETE',
+              url : BASE_URL.url +'/fuelPricing/resetAll',
+              headers : {'Content-Type': 'application/json'},
+              data: data
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
 
         
       }