diff --git a/app/partials/ContactView/ContactView.controller.js b/app/partials/ContactView/ContactView.controller.js
index f1e16f7..b768daa 100644
--- a/app/partials/ContactView/ContactView.controller.js
+++ b/app/partials/ContactView/ContactView.controller.js
@@ -10,15 +10,16 @@
         });
         
         ContactViewService.getContacts().then(function(result) {
-        	console.log('==========',result);
         	$scope.contactList = result;
-          
         })
 
+        $scope.reset = function(){
+          $("input").val("");
+        }
+
         $scope.changePriceEmail = function(id, index){
           event.stopPropagation();
           var contactId = id;
-          console.log($scope.contactList[index].priceEmail)
           var statusData = "status=" + $scope.contactList[index].priceEmail;
           ViewcontactService.changePriceEmail(contactId, statusData).then(function(result) {
               if(result.success){
@@ -30,7 +31,6 @@
         }
         
         ContactViewService.getCompanies().then(function(result) {
-        	console.log('==========',result);
         	$scope.companies = result;
           
         })
@@ -38,7 +38,6 @@
         $scope.contactData = {};
         $scope.contactData.contactList = [];
         $scope.addContact = function(){
-          console.log('==== $scope.data======', $scope.data);
           $scope.contactData.contactList.push($scope.data);
           ViewCompanyService.addContact($scope.contactData).then(function(result) {
             if(result.success){
diff --git a/app/partials/ContactView/ContactView.html b/app/partials/ContactView/ContactView.html
index 51df1ce..10dd1ad 100644
--- a/app/partials/ContactView/ContactView.html
+++ b/app/partials/ContactView/ContactView.html
@@ -304,7 +304,7 @@
                </div>
             </div>
             <div class="modal-footer" style="border-top: 0;">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-default" ng-click="reset()" data-dismiss="modal">Cancel</button>
                 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addContact()">Save</button>
             </div>
         </div>
diff --git a/app/partials/FuelVendors/FuelVendors.controller.js b/app/partials/FuelVendors/FuelVendors.controller.js
index 30e1057..48e9702 100644
--- a/app/partials/FuelVendors/FuelVendors.controller.js
+++ b/app/partials/FuelVendors/FuelVendors.controller.js
@@ -10,6 +10,11 @@
 		$(document).ready(function() {
 		    $('#example').DataTable();
 		});
+
+		$scope.reset = function(){
+			$("input").val("");
+		}
+		
 		$scope.data = {};
 		$scope.aircraft = {};
 		$scope.data.activate = true;
diff --git a/app/partials/FuelVendors/FuelVendors.html b/app/partials/FuelVendors/FuelVendors.html
index 81c8ca8..39d0e93 100644
--- a/app/partials/FuelVendors/FuelVendors.html
+++ b/app/partials/FuelVendors/FuelVendors.html
@@ -606,7 +606,7 @@
                 This is the final step.
             </div> -->
             <div class="modal-footer" style="border-top: 0;">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-default" ng-click="reset()" data-dismiss="modal">Cancel</button>
                 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#vendor-modal-3', 2)">Next: Add Aircraft</button>
                 <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#vendor-modal-3', 1)">Go Back</button>
                 <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#vendor-modal-3', 3)">Continue</button> -->
diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js
index d48631d..306694b 100644
--- a/app/partials/customers/customers.controller.js
+++ b/app/partials/customers/customers.controller.js
@@ -8,6 +8,11 @@
 		$(document).ready(function() {
 		    $('#example').DataTable();
 		});
+
+		$scope.reset2 = function(){
+			$("input").val("");
+		}
+		
 		$scope.data = {};
 		$scope.aircraft = {};
 		$scope.data.activate = true;
@@ -16,7 +21,6 @@
 
 		function getAllCompanies(){
 			CustomersService.getAllCompanies().then(function(result) {
-				console.log(result)
 				$scope.companyList = result;
 				for(var i=0; i<$scope.companyList.length; i++){
 					$scope.companyList[i].masterMargin = $scope.companyList[i].margin.id;
@@ -26,7 +30,6 @@
 
         $scope.editMargin = function(customer){
         	event.stopPropagation();
-        	console.log(customer.masterMargin)
 
         	var companyMargin = "companyName=" + customer.companyName + "&masterMargin=" + customer.masterMargin 
               + "&addressOne=" + customer.addressOne + "&addressTwo=" + customer.addressTwo + "&city=" + customer.city + "&state=" 
@@ -64,7 +67,6 @@
 		$scope.showMarginError = false;
 
 		$scope.removeValidation = function(){
-			console.log('key up');
 			$scope.showCompanyError = false;
 	    	$('.companyNameInput').removeClass('customErrorInput');
 		}
@@ -75,7 +77,6 @@
 		}
 
 	    $scope.addFirstData = function(sel, step){
-	    	// console.log($scope.data)
 	    	if($scope.data.companyName == undefined){
 	    		$scope.showCompanyError = true;
 	    		$('.companyNameInput').addClass('customErrorInput');
@@ -91,7 +92,6 @@
 		    	+ "&activate=" + $scope.data.activate + "&baseIcao=" + $scope.data.baseIcao;
 
 		    	CustomersService.addCompany(companyData).then(function(result) {
-	            	console.log(result)
 	            	$scope.accountId = result;
 	      			$scope.aircraft.accountId = $scope.accountId;
 	          	})
@@ -116,7 +116,6 @@
 	            'sizeId' : '',
 	            'marginId': ''
             });
-            console.log($scope.aircraftDetails)
         };
 
         $scope.getModal = function(makeId, index){
@@ -134,9 +133,8 @@
       		$scope.showLoader = true;
 	        CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
 	        	$scope.showLoader = false;
-	          $scope.aircraftDetails[index].aircraftSizeList = result;
+	          	$scope.aircraftDetails[index].aircraftSizeList = result;
 	          //$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0];
-	          console.log($scope.aircraftDetails[index].size)
 	        })
       	}
 
@@ -156,7 +154,6 @@
 	        $scope.aircraftListData.accountId = $scope.aircraft.accountId;
 	        
 	        CustomersService.addAircraft($scope.aircraftListData).then(function(result) {
-	        	console.log(result)
 
 	        	if(result != null && result.success){
 	        		toastr.success(''+result.success+'', {
diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html
index e0336cd..865879e 100644
--- a/app/partials/customers/customers.html
+++ b/app/partials/customers/customers.html
@@ -529,7 +529,7 @@
                 This is the final step.
             </div> -->
             <div class="modal-footer" style="border-top: 0;">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button>
                 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button>
                 <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button>
                 <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> -->
diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js
index 0d7fc1a..c85b005 100644
--- a/app/partials/viewCompany/viewCompany.controller.js
+++ b/app/partials/viewCompany/viewCompany.controller.js
@@ -14,6 +14,12 @@
         $scope.showUpdateBtn = false;
         $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'));
 
+        $(document).ready(function() {
+            $("#reset").click(function() {
+                $("input").val("");
+            });
+        });
+
         CustomersService.getMargin().then(function(result) {
           $scope.marginList = result;
         })
@@ -177,6 +183,10 @@
         $scope.showUpdateBtn = true;
       }
 
+      $scope.base = function(){
+        $scope.showUpdateBtn = true;
+      }
+
       $scope.addressChange = function(){
         $scope.showAddress = false;
         $scope.showUpdateBtn = true;
@@ -220,6 +230,13 @@
           
       }
 
+      $scope.cancelData = function(){
+          $scope.showNoteData = true;
+          $scope.showCompanyName = true;
+          $scope.showAddress = true;
+          $scope.showUpdateBtn = false;
+      }
+
       $scope.sendMail = function(){
         ViewCompanyService.sendMail(companyId).then(function(result) {
             if(result != null && result.success){
@@ -329,13 +346,13 @@
           contactName = value;
           $('#customField').css('display', 'block');
         }
-        
+        $scope.custom = {};
       }
 
       $scope.cancelCustomField = function(){
         $('#customField').css('display', 'none');
       }
-      $scope.custom = {};
+      
       $scope.acceptCustomField = function(){
         if($scope.custom.content == undefined){
           toastr.error('Please add some content', {
@@ -360,11 +377,11 @@
         }
       }
 
-      updateFuelManagerService.getFuelPricing($scope.userProfileId).then(function(result) {
+      updateFuelManagerService.getFuelPricingNew().then(function(result) {
         $scope.fuelPricing = result;
         for (var i = 0; i<$scope.fuelPricing.length; i++) {
-          if ($scope.fuelPricing[i].expirationDate != null) {
-              $scope.fuelPricing[i].expirationDate = new Date($scope.fuelPricing[i].expirationDate)
+          if ($scope.fuelPricing[i].fuelPricing.expirationDate != null) {
+              $scope.fuelPricing[i].fuelPricing.expirationDate = new Date($scope.fuelPricing[i].fuelPricing.expirationDate)
           }
         }
       })
diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html
index 2a068d0..95f44d0 100644
--- a/app/partials/viewCompany/viewCompany.html
+++ b/app/partials/viewCompany/viewCompany.html
@@ -141,7 +141,7 @@
                             <i class="fa fa-building-o" aria-hidden="true"></i>
                             <h3>Company Details</h3>
                             <label>BASE ICAO</label>
-                            <input type="tel" ng-model="companyData.baseIcao" style="line-height: 18px;width: 50px;padding: 0px 9px;" />
+                            <input type="tel" ng-model="companyData.baseIcao" ng-click="base()" style="line-height: 18px;width: 50px;padding: 0px 9px;" />
                            
                             <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
                               <toggle ng-model="companyData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Dactive"></toggle>
@@ -157,7 +157,7 @@
                                  <input type="tel" ng-hide="showCompanyName" ng-model="companyData.companyName" class="form-control"/>
                               </div>
                               <div class="col-md-5">
-                                 <select class="form-control" style="padding: 4px 8px;background: #ebebeb;" ng-model="companyData.certificateType" ng-click="editData()">
+                                 <select class="form-control" style="padding: 4px 8px;background: #ebebeb;" ng-model="companyData.certificateType">
                                     <option class="optionclass" disabled selected>Certificate Type</option>
                                     <option class="optionclass" value="corporate">Part 91 (Corporate)</option>
                                     <option class="optionclass" value="charter">Part 135 (Charter)</option>
@@ -171,7 +171,7 @@
                               <p class="new-label">
                                  <span>Master Margin Setting </span> 
                                  <!-- <select class="form-control" ng-model="companyData.masterMargin" ng-options="margin.id as margin.marginName for margin in marginList"></select> -->
-                                 <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-model="companyData.masterMargin" ng-click="editData()">
+                                 <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-model="companyData.masterMargin">
                                     <option ng-repeat="margin in marginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                  </select>
                                  <span>&nbsp;See Aircrart List</span>
@@ -180,14 +180,14 @@
                            </div>
                            <div class="row"  style="margin-left:0px;"> 
                               <div class="col-md-5" style="padding-left: 0;">
-                                 <input type="checkbox" name="" ng-click="editData()" ng-model="companyData.baseTenant"> Tenant/Base Customer
+                                 <input type="checkbox" name="" ng-model="companyData.baseTenant"> Tenant/Base Customer
                               </div>
                               <div class="col-md-5" style="padding-left: 0;">
-                                 <input type="checkbox" name="" ng-click="editData()" ng-model="companyData.fuelerlinxCustomer"> FuelerLinx Customer
+                                 <input type="checkbox" name="" ng-model="companyData.fuelerlinxCustomer"> FuelerLinx Customer
                               </div>
                            </div>
                            <div>
-                              <input type="checkbox" name="" ng-click="editData()" ng-model="companyData.contractFuelVendor"> CAA Member
+                              <input type="checkbox" name="" ng-model="companyData.contractFuelVendor"> CAA Member
                            </div>
                            </br>
                            <div class="new-address">
@@ -238,6 +238,7 @@
                            </div>
                            <div class="pull-left">
                               <button ng-click="editData()" ng-show="showUpdateBtn" class="btn btn-success">Save</button>
+                              <button ng-click="cancelData()" ng-show="showUpdateBtn" class="btn btn-default">Cancel</button>
                            </div>
                            <div class="pull-right">
                               <button type="button" ng-click="openConfirmMail()" class="btn btn-primary">Distribute Price to Company Contacts</button>
@@ -356,13 +357,13 @@
                                  </thead>
                                  <tbody>
                                     <tr ng-repeat="fuel in fuelPricing">
-                                       <td><input type="checkbox"></td>
-                                       <td>{{fuel.product.name}}</td>
-                                       <td>${{fuel.cost}}</td>
-                                       <td>${{fuel.papMargin}}</td>
-                                       <td style="color:#55AF8B;">${{fuel.papTotal}}</td>
-                                       <td style="color:#F90">{{fuel.expirationDate}}</td>
-                                    </tr>
+                                       <td><input type="checkbox" ng-model="fuel.status"></td>
+                                       <td>{{fuel.name}}</td>
+                                       <td>${{fuel.fuelPricing.cost}}</td>
+                                       <td>${{fuel.fuelPricing.papMargin}}</td>
+                                       <td style="color:#55AF8B;">${{fuel.fuelPricing.papTotal}}</td>
+                                       <td style="color:#F90">{{fuel.fuelPricing.expirationDate}}</td>
+                                    </tr>.
                                  </tbody>
                               </table>
                            </div>
@@ -532,7 +533,7 @@
                </div>
             </div>
             <div class="modal-footer" style="border-top: 0;">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-default" id="reset" data-dismiss="modal">Cancel</button>
                 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addContact()">Save</button>
             </div>
         </div>
@@ -619,7 +620,7 @@
                </div>
             </div>
             <div class="modal-footer" style="border-top: 0;">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-default" id="reset" data-dismiss="modal">Cancel</button>
                 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="saveCompanyData()">Save</button>
             </div>
         </div>
diff --git a/app/partials/viewcontact/viewcontact.controller.js b/app/partials/viewcontact/viewcontact.controller.js
index 2ee1f97..cda60b4 100644
--- a/app/partials/viewcontact/viewcontact.controller.js
+++ b/app/partials/viewcontact/viewcontact.controller.js
@@ -148,6 +148,17 @@
 	        })
         }
 
+        $scope.cancelContact = function(){
+            $scope.editName = true;
+            $scope.editCompany = true;
+            $scope.editAddress = true;
+            $scope.editPhone = true;
+            $scope.editMobile = true;
+            $scope.editEmail = true;
+            $scope.editContactNotes = true;
+            $scope.showUpdateBtn = false;
+        }
+
         $scope.checkPrimaryContact = function(companyId){
             if($scope.contactDetail.primaryContact == true){
             ViewCompanyService.checkPrimaryContact(companyId).then(function(result) {
diff --git a/app/partials/viewcontact/viewcontact.html b/app/partials/viewcontact/viewcontact.html
index 0294b3b..e0898dd 100644
--- a/app/partials/viewcontact/viewcontact.html
+++ b/app/partials/viewcontact/viewcontact.html
@@ -95,6 +95,7 @@
                               
                               <div>
                                 <button ng-click="updateContact(contactDetail)" ng-show="showUpdateBtn" class="btn btn-success pull-left">Update Contact</button>
+                                <button ng-click="cancelContact()" style="margin-left: 5px;" ng-show="showUpdateBtn" class="btn btn-default pull-left">Cancel</button>
                                 <button type="button" class="btn btn-primary pull-right">Send Price to This Contacts</button>
                                 <div class="clearfix"></div>
                               </div>