diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js
index 1fd9883..1a24209 100644
--- a/app/partials/viewCompany/viewCompany.controller.js
+++ b/app/partials/viewCompany/viewCompany.controller.js
@@ -26,7 +26,9 @@
 
         var value = "";
         var companyId = $stateParams.id;
-
+        $scope.companyData = {};
+        $scope.multipleMsg = false;
+        $scope.companyData.masterMargin = "";
         getCompanyDetail();
         function getCompanyDetail(){
           ViewCompanyService.getCompany(companyId).then(function(result) {
@@ -34,6 +36,9 @@
             if(result.margin != null){
                $scope.companyData.masterMargin = result.margin.id;
             }
+            if(result.marginAVGAS != null){
+                $scope.companyData.avgasMargin = result.marginAVGAS.id;
+             }
             $scope.showLoader = false;
           })
         }
@@ -57,14 +62,31 @@
             $scope.companyContactList = result;
           })
         }
-
+        $scope.aircraftmargins = [];
         getAircraftList();
         function getAircraftList(){
           ViewCompanyService.getAircraft(companyId).then(function(result) {
             $scope.contactAircraftList = result;
+            for (var i = 0; i < $scope.contactAircraftList.length; i++) {
+            	if($scope.contactAircraftList[i].aircraftsMargin != null){
+            		$scope.aircraftmargins.push({
+            			'id': $scope.contactAircraftList[i].aircraftsMargin.id
+            		})
+            	}
+            }
+            if($scope.aircraftmargins.length > 0) {
+            	for (var i = 0; i < $scope.aircraftmargins.length; i++) {
+                	if($scope.aircraftmargins[i].id != $scope.companyData.masterMargin){
+                		$scope.multiple = true;
+                		$scope.multipleMsg = true;
+                        if($scope.multiple) {
+                      		$scope.companyData.masterMargin = "multiple";
+                        }
+                	}
+                }
+            }
           })
         }
-        
 
         $scope.contactData = {};
         $scope.contactData.contactList = [];
@@ -206,7 +228,7 @@
           $scope.showCompanyName = true;
           $scope.showAddress = true;
 
-          var companyData = "companyName=" + $scope.companyData.companyName + "&masterMargin=" + $scope.companyData.masterMargin 
+          var companyData = "companyName=" + $scope.companyData.companyName + "&masterMargin=" + $scope.companyData.masterMargin + "&avgasMargin=" + $scope.companyData.avgasMargin
             + "&addressOne=" + $scope.companyData.addressOne + "&addressTwo=" + $scope.companyData.addressTwo + "&city=" + $scope.companyData.city + "&state=" 
             + $scope.companyData.state + "&country=" + $scope.companyData.country + "&zipcode=" + $scope.companyData.zipcode + "&internalNote=" 
             + $scope.companyData.internalNote + "&certificateType=" + $scope.companyData.certificateType + "&baseTenant=" + $scope.companyData.baseTenant
@@ -397,5 +419,13 @@
             getAircraftList();
           })
       }
+      
+      	CustomersService.getJetMargin($scope.userProfileId).then(function(result) {
+		  $scope.jetMarginList = result;
+		})
+
+		CustomersService.getAvgMargin($scope.userProfileId).then(function(result) {
+		  $scope.avgsMarginList = result;
+		})
         
   }]);
\ No newline at end of file
diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html
index 5ba9926..3b7065b 100644
--- a/app/partials/viewCompany/viewCompany.html
+++ b/app/partials/viewCompany/viewCompany.html
@@ -169,12 +169,21 @@
                            </div>
                            <div>
                               <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">
-                                    <option ng-repeat="margin in marginList" value="{{margin.id}}">{{margin.marginName}}</option>
+                                 <span>JET A Margin </span> 
+                                 <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-change="editData()" ng-model="companyData.masterMargin">
+                                 	<option ng-if="multiple" value="multiple">Multiple</option>
+                                    <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
+                                 </select>
+                                 <span ng-show="multipleMsg">&nbsp;See Aircrart List</span>
+                                 <div class="clearfix"></div>
+                              </p>
+                           </div>
+                           <div>
+                              <p class="new-label">
+                                 <span>AVGAS 100LL </span> 
+                                 <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-change="editData()" ng-model="companyData.avgasMargin">
+                                    <option ng-repeat="margin in avgsMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
                                  </select>
-                                 <span>&nbsp;See Aircrart List</span>
                                  <div class="clearfix"></div>
                               </p>
                            </div>