diff --git a/app/css/custom.css b/app/css/custom.css
index 5b94e4f..5de728e 100644
--- a/app/css/custom.css
+++ b/app/css/custom.css
@@ -690,4 +690,13 @@ font-size: 10px !important;
 .myLoader img{
 	position: relative;
 	top: calc(50% - 25px);
+}
+.customErrorInput{
+    background-color: rgb(251, 227, 228);
+    border: 1px solid #fbc2c4;
+    color: #8a1f11;
+}
+.customErrorMessage{
+    color: #8a1f11;
+    font-weight: bold;
 }
\ No newline at end of file
diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js
index e5a66b9..4f18efd 100644
--- a/app/partials/customers/customers.controller.js
+++ b/app/partials/customers/customers.controller.js
@@ -61,17 +61,28 @@
 		CustomersService.getMargin().then(function(result) {
 		  $scope.marginList = result;
 		})
+		$scope.showCompanyError = false;
+		$scope.showMarginError = false;
+
+		$scope.removeValidation = function(){
+			console.log('key up');
+			$scope.showCompanyError = false;
+	    	$('.companyNameInput').removeClass('customErrorInput');
+		}
+
+		$scope.removeMarginValidation = function(){
+			$scope.showMarginError = false;
+	    	$('.marginSelectBox').removeClass('customErrorInput');
+		}
 
 	    $scope.addFirstData = function(sel, step){
 	    	// console.log($scope.data)
 	    	if($scope.data.companyName == undefined){
-	    		toastr.error('Please enter Company Name', {
-	            	closeButton: true
-	          	})
+	    		$scope.showCompanyError = true;
+	    		$('.companyNameInput').addClass('customErrorInput');
 	    	}else if($scope.data.masterMargin == undefined){
-	    		toastr.error('Please select Master Margin', {
-	            	closeButton: true
-	          	})
+	    		$scope.showMarginError = true;
+	    		$('.marginSelectBox').addClass('customErrorInput');
 	    	}else{
 	    		var companyData = "companyName=" + $scope.data.companyName + "&masterMargin=" + $scope.data.masterMargin 
 		    	+ "&addressOne=" + $scope.data.addressOne + "&addressTwo=" + $scope.data.addressTwo + "&city=" + $scope.data.city + "&state=" 
diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html
index 59fdae2..c307216 100644
--- a/app/partials/customers/customers.html
+++ b/app/partials/customers/customers.html
@@ -238,14 +238,15 @@
                                        <label class="new-input-label"><b>Company Name</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
-                                       <input type="text" ng-model="data.companyName" class="form-control" id="Address" placeholder="" required>
+                                       <input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required>
+                                       <label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-4">
                                     
                                     <div class="pull-right">
-                                       <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" id="Address" placeholder="">
+                                       <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control"  placeholder="">
                                     </div>
                                     <div class="pull-right">
                                        <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>
@@ -275,7 +276,8 @@
                                        <b>Master Margin</b>
                                     </div>
                                     <div class="pull-left">
-                                       <select class="form-control" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in marginList" required></select>
+                                       <select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in marginList" required ng-change="removeMarginValidation()"></select>
+                                       <label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>
 
                                        <!-- <select required class="form-control" style="max-width: 250px;" ng-model="data.masterMargin">
                                           <option value="" disabled selected hidden>Select </option>
@@ -310,7 +312,7 @@
                                        <label class="new-input-label"><b>Address</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <input type="text" class="form-control" ng-model="data.addressOne" id="Address" placeholder="">
+                                       <input type="text" class="form-control" ng-model="data.addressOne"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -323,7 +325,7 @@
                                        <label class="new-input-label"><b>Address2</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <input type="text" ng-model="data.addressTwo" class="form-control" id="Address" placeholder="">
+                                       <input type="text" ng-model="data.addressTwo" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -337,7 +339,7 @@
                                        <label class="new-input-label"><b>City</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <input type="text" ng-model="data.city" class="form-control" id="Address" placeholder="">
+                                       <input type="text" ng-model="data.city" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -346,7 +348,7 @@
                                        <label class="new-input-label"><b>State</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <input type="text" ng-model="data.state" class="form-control" id="Address" placeholder="">
+                                       <input type="text" ng-model="data.state" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -355,7 +357,7 @@
                                        <label class="new-input-label"><b>Zip Code</b></label>
                                     </div>
                                     <div class="pull-right" style="width: calc(100% - 60px);">
-                                       <input type="tel" ng-model="data.zipcode" class="form-control" id="Address" placeholder="">
+                                       <input type="tel" ng-model="data.zipcode" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -369,7 +371,7 @@
                                        <label class="new-input-label"><b>Country</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <input type="text" ng-model="data.country" class="form-control" id="Address" placeholder="">
+                                       <input type="text" ng-model="data.country" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
diff --git a/app/partials/updateFuelManager/updateFuelManager.controller.js b/app/partials/updateFuelManager/updateFuelManager.controller.js
index d741f46..922f10d 100644
--- a/app/partials/updateFuelManager/updateFuelManager.controller.js
+++ b/app/partials/updateFuelManager/updateFuelManager.controller.js
@@ -6,7 +6,7 @@
 
 
       .controller('updateFuelManagerController', ['$scope','$uibModal', 'updateFuelManagerService', function($scope , $uibModal, updateFuelManagerService) {
-		
+		$scope.showLoader = true;
         $scope.yes = function(data){
             console.log('========');
             console.log('value', data);
@@ -21,12 +21,14 @@
 
         updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
           $scope.aTypeJets = result;
+          $scope.showLoader = false;
         })
         updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
           $scope.vTypeJets = result;
-          console.log('second jets', result);
+          $scope.showLoader = false;
         })
         $scope.toggleJestAccordian = function(id, index){
+            $scope.showLoader = true;
             $('.'+id).slideDown();
             $('#'+id).addClass('customActive');
             $('#'+id+' select, #'+id+' input').prop("disabled", false);
@@ -35,9 +37,11 @@
             
             updateFuelManagerService.getJetTiers(id).then(function(tiers) {
                 $scope.aTypeJets[index].tierList = tiers;
+                $scope.showLoader = false;
             })
         }
         $scope.toggleVtypeJestAccordian = function(id, index){
+            $scope.showLoader = true;
             $('.'+id).slideDown();
             $('#'+id).addClass('customActive');
             $('#'+id+' select, #'+id+' input').prop("disabled", false);
@@ -46,10 +50,12 @@
             
             updateFuelManagerService.getJetTiers(id).then(function(tiers) {
                 $scope.vTypeJets[index].tierList = tiers;
+                $scope.showLoader = false;
             })
         }
         //$scope.trData = {};
         $scope.addNewTier = function(id, trData, index){
+            $scope.showLoader = true;
             $scope.tr = {};
             $scope.tr[index] = {};
             $scope.tr[index].minTierBreak = trData[index].minTierBreak;
@@ -68,13 +74,16 @@
                 trData[index].minTierBreak = '';
                 trData[index].maxTierBreak = '';
                 trData[index].margin = '';
+
                 updateFuelManagerService.getJetTiers(id).then(function(tiers) {
                   $scope.aTypeJets[index].tierList = tiers;
+                  $scope.showLoader = false;
                 })
             })
         }
 
         $scope.addNewVtypeTier = function(id, vtrData, index){
+            $scope.showLoader = true;
             $scope.tr = {};
             $scope.tr[index] = {};
             $scope.tr[index].minTierBreak = vtrData[index].minTierBreak;
@@ -95,11 +104,13 @@
                 vtrData[index].margin = '';
                 updateFuelManagerService.getJetTiers(id).then(function(tiers) {
                   $scope.vTypeJets[index].tierList = tiers;
+                  $scope.showLoader = false;
                 })
             })
         }
 
-        $scope.editTier = function(tier){
+        $scope.editTier = function(tier, index){
+            $scope.showLoader = true;
             var editTierData = 'minTierBreak='+tier.minTierBreak+'&maxTierBreak='+tier.maxTierBreak+'&margin='+tier.margin+
             '&marginTotal='+tier.marginTotal+'&marginTemplateId='+tier.marginTemplate.id+'&marginId='+tier.id;
 
@@ -108,24 +119,58 @@
                   closeButton: true
                 })
                 updateFuelManagerService.getJetTiers(tier.marginTemplate.id).then(function(tiers) {
-                  $scope.tierList = tiers;
+                  $scope.aTypeJets[index].tierList = tiers;
+                  $scope.showLoader = false;
                 })
             })
 
         }
 
-        $scope.deleteTier = function(id, jetid){
+        $scope.editVtypeTier = function(tier, index){
+            $scope.showLoader = true;
+            var editTierData = 'minTierBreak='+tier.minTierBreak+'&maxTierBreak='+tier.maxTierBreak+'&margin='+tier.margin+
+            '&marginTotal='+tier.marginTotal+'&marginTemplateId='+tier.marginTemplate.id+'&marginId='+tier.id;
+
+            updateFuelManagerService.editTier(editTierData).then(function(result) {
+                toastr.success('Successfully Updated', {
+                  closeButton: true
+                })
+                updateFuelManagerService.getJetTiers(tier.marginTemplate.id).then(function(tiers) {
+                  $scope.vTypeJets[index].tierList = tiers;
+                  $scope.showLoader = false;
+                })
+            })
+
+        }
+
+        $scope.deleteTier = function(id, jetid, index){
+            $scope.showLoader = true;
             updateFuelManagerService.deleteTier(id).then(function(result) {
                 toastr.success(''+result.success+'', {
                   closeButton: true
                 })
                 updateFuelManagerService.getJetTiers(jetid).then(function(tiers) {
-                  $scope.tierList = tiers;
+                  $scope.aTypeJets[index].tierList = tiers;
+                  $scope.showLoader = false;
+                })
+            })
+        }
+
+        $scope.deleteVtypeTier = function(id, jetid, index){
+            $scope.showLoader = true;
+            updateFuelManagerService.deleteTier(id).then(function(result) {
+                toastr.success(''+result.success+'', {
+                  closeButton: true
+                })
+                updateFuelManagerService.getJetTiers(jetid).then(function(tiers) {
+                  $scope.vTypeJets[index].tierList = tiers;
+                  $scope.showLoader = false;
                 })
             })
         }
 
         $scope.saveJetAccordian = function(jets){
+            $scope.showLoader = true;
             $scope.jetsDetail = jets;
             $scope.jetsDetail.userProfileId = $scope.userProfileId;
             //console.log('jets', $scope.jetsDetail);
@@ -145,12 +190,14 @@
                 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
                   console.log('result', result);
                   $scope.aTypeJets = result;
+                  $scope.showLoader = false;
                 })
             })
 
         }
 
         $scope.saveVtypeJetAccordian = function(jets){
+            $scope.showLoader = true;
             $scope.jetsDetail = jets;
             $scope.jetsDetail.userProfileId = $scope.userProfileId;
             //console.log('jets', $scope.jetsDetail);
@@ -170,6 +217,7 @@
                 updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
                   $scope.vTypeJets = result;
                   console.log('second jets', result);
+                  $scope.showLoader = false;
                 })
             })
 
@@ -188,6 +236,7 @@
         //$scope.newJet.productType = '';
 
         $scope.addNewATypeJet = function(){
+            $scope.showLoader = true;
             $scope.newJet.productType = 'JET-A';
             $scope.newJet.userProfileId = $scope.userProfileId;
 
@@ -202,6 +251,7 @@
                 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
                   console.log('result', result);
                   $scope.aTypeJets = result;
+                  $scope.showLoader = false;
                 })
             })
         }
@@ -217,6 +267,7 @@
         }
 
         $scope.addNewVTypeJet = function(){
+            $scope.showLoader = true;
             $scope.newVtypeJet.productType = 'AVGAS';
             $scope.newVtypeJet.userProfileId = $scope.userProfileId;
 
@@ -230,7 +281,7 @@
                 $('.addNewVtype').css('display', 'none');
                 updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
                   $scope.vTypeJets = result;
-                  
+                  $scope.showLoader = false;
                 })
             })
 
diff --git a/app/partials/updateFuelManager/updateFuelManager.html b/app/partials/updateFuelManager/updateFuelManager.html
index ca3b6d2..ba13969 100644
--- a/app/partials/updateFuelManager/updateFuelManager.html
+++ b/app/partials/updateFuelManager/updateFuelManager.html
@@ -3,6 +3,9 @@
    color: #ff9900;
    }
 </style>
+<div class="myLoader" ng-show="showLoader">
+  <img src="../img/hourglass.gif" width="50px;">
+</div>
 <div class="container">
    <div class="row">
       <div class="col-md-5">
@@ -112,9 +115,9 @@
 
                                  <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal}})</span>
 
-                                 <button class="addTierBtn" ng-click="editTier(tier)" ng-show="showEditTier">Save</button>
+                                 <button class="addTierBtn" ng-click="editTier(tier, $parent.$index)" ng-show="showEditTier">Save</button>
 
-                                 <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteTier(tier.id, jets.id)" aria-hidden="true" ng-show="showEditTier"></i>
+                                 <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteTier(tier.id, jets.id, $parent.$index)" aria-hidden="true" ng-show="showEditTier"></i>
 
                                  <div class="clearfix"></div>
                               </div>
@@ -268,9 +271,9 @@
 
                                  <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal}})</span>
 
-                                 <button class="addTierBtn" ng-click="editTier(tier)" ng-show="showEditTier">Save</button>
+                                 <button class="addTierBtn" ng-click="editVtypeTier(tier, $parent.$index)" ng-show="showEditTier">Save</button>
 
-                                 <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteTier(tier.id, jets.id)" aria-hidden="true" ng-show="showEditTier"></i>
+                                 <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteVtypeTier(tier.id, jets.id, $parent.$index)" aria-hidden="true" ng-show="showEditTier"></i>
 
                                  <div class="clearfix"></div>
                               </div>