diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
index 03138ffeb..1593a37d6 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
@@ -33,123 +33,131 @@ export class AssetsInfoComponent implements OnInit {
 
   public _assetsQuesFrom: FormGroup;
   public submitted = false;
+  public m_assets_type = [];
+  // public m_assets_type = [
+  //   {
+  //     'id': "1",
+  //     'name': "Property"
+  //   },
+  //   {
+  //     'id': "2",
+  //     'name': "Four Wheeler"
+  //   },
+  //   {
+  //     'id': "3",
+  //     'name': "Two Wheeler"
+  //   },
+  //   {
+  //     'id': "4",
+  //     'name': "Jewellery"
+  //   },
+  //   {
+  //     'id': "5",
+  //     'name': "Consumer Durable"
+  //   },
+  //   {
+  //     'id': "6",
+  //     'name': "Insurance"
+  //   },
+  //   {
+  //     'id': "7",
+  //     'name': "Investments"
+  //   },
+  //   {
+  //     'id': "8",
+  //     'name': "Others"
+  //   }
+  // ]
 
-  public m_assets_type = [
-    {
-      'id': "1",
-      'name': "Property"
-    },
-    {
-      'id': "2",
-      'name': "Four Wheeler"
-    },
-    {
-      'id': "3",
-      'name': "Two Wheeler"
-    },
-    {
-      'id': "4",
-      'name': "Jewellery"
-    },
-    {
-      'id': "5",
-      'name': "Consumer Durable"
-    },
-    {
-      'id': "6",
-      'name': "Insurance"
-    },
-    {
-      'id': "7",
-      'name': "Investments"
-    },
-    {
-      'id': "8",
-      'name': "Others"
-    }
-  ]
+public m_propertyType = [];
 
-  public m_propertyType = [
-    {
-      'id': "1",
-      'name': 'Residential'
-    },
-    {
-      'id': "2",
-      'name': 'Commercial'
-    },
-    {
-      'id': "3",
-      'name': 'Industrial'
-    },
-    {
-      'id': "4",
-      'name': 'Land'
-    }
-  ];
+  // public m_propertyType = [
+  //   {
+  //     'id': "1",
+  //     'name': 'Residential'
+  //   },
+  //   {
+  //     'id': "2",
+  //     'name': 'Commercial'
+  //   },
+  //   {
+  //     'id': "3",
+  //     'name': 'Industrial'
+  //   },
+  //   {
+  //     'id': "4",
+  //     'name': 'Land'
+  //   }
+  // ];
 
-  public m_insuranceType = [{
-    'id': "1",
-    'name': 'Life'
-  }, {
-    'id': "2",
-    'name': 'Health'
-  }]
+public m_insuranceType = [];
 
-  public m_investmentType = [{
-    'id': "1",
-    'name': 'FD'
-  }, {
-    'id': "2",
-    'name': 'RD'
-  }, {
-    'id': "3",
-    'name': 'Mutual Funds'
-  }, {
-    'id': "4",
-    'name': 'PPF'
-  }, {
-    'id': "5",
-    'name': 'Shares'
-  }, {
-    'id': "6",
-    'name': 'Others'
-  }]
+  // public m_insuranceType = [{
+  //   'id': "1",
+  //   'name': 'Life'
+  // }, {
+  //   'id': "2",
+  //   'name': 'Health'
+  // }]
 
-  public m_freqOfPurchase = [
-    {
-      'id': "1",
-      'name': 'Daily'
-    },
-    {
-      'id': "2",
-      'name': 'Weekly'
-    },
-    {
-      'id': "3",
-      'name': 'Monthly'
-    },
-    {
-      'id': "4",
-      'name': 'Every 3 months'
-    },
-    {
-      'id': "5",
-      'name': 'Half yearly'
-    },
-    {
-      'id': "6",
-      'name': 'Yearly'
-    },
-    {
-      'id': "7",
-      'name': 'As and when required'
-    },
-    {
-      'id': "8",
-      'name': 'Others'
-    }
-  ]
+public m_investmentType = [];
+
+  // public m_investmentType = [{
+  //   'id': "1",
+  //   'name': 'FD'
+  // }, {
+  //   'id': "2",
+  //   'name': 'RD'
+  // }, {
+  //   'id': "3",
+  //   'name': 'Mutual Funds'
+  // }, {
+  //   'id': "4",
+  //   'name': 'PPF'
+  // }, {
+  //   'id': "5",
+  //   'name': 'Shares'
+  // }, {
+  //   'id': "6",
+  //   'name': 'Others'
+  // }]
+
+ public m_freqOfPurchase = [];
+
+  // public m_freqOfPurchase = [
+  //   {
+  //     'id': "1",
+  //     'name': 'Daily'
+  //   },
+  //   {
+  //     'id': "2",
+  //     'name': 'Weekly'
+  //   },
+  //   {
+  //     'id': "3",
+  //     'name': 'Monthly'
+  //   },
+  //   {
+  //     'id': "4",
+  //     'name': 'Every 3 months'
+  //   },
+  //   {
+  //     'id': "5",
+  //     'name': 'Half yearly'
+  //   },
+  //   {
+  //     'id': "6",
+  //     'name': 'Yearly'
+  //   },
+  //   {
+  //     'id': "7",
+  //     'name': 'As and when required'
+  //   },
+  //   {
+  //     'id': "8",
+  //     'name': 'Others'
+  //   }
+  // ]
 
   private notifier: NotifierService;
   constructor(
@@ -162,7 +170,78 @@ export class AssetsInfoComponent implements OnInit {
   ngOnInit() {
 
     this.getPdSupplierFormDetails();
+
+    this.getM_Assets_Type();
+    this.getM_PropertyType();
+    this.getM_InvestmentType();
+    this.getM_FreqOfPurchase();
+    this.getM_InsuranceType();
   }
+
+// ======================
+
+  getM_Assets_Type() {
+    this.pdTrigerService.getAllMasterDatas('ASSETTYPE').subscribe(
+      data => {
+        this.m_assets_type = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+   getM_PropertyType() {
+    this.pdTrigerService.getAllMasterDatas('PROPERTIES').subscribe(
+      data => {
+        this.m_propertyType = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+   getM_InvestmentType() {
+    this.pdTrigerService.getAllMasterDatas('INVESTMENTTYPE').subscribe(
+      data => {
+        this.m_investmentType = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+   getM_FreqOfPurchase() {
+    this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe(
+      data => {
+        this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+   getM_InsuranceType() {
+    this.pdTrigerService.getAllMasterDatas('INSURANCETYPE').subscribe(
+      data => {
+        this.m_insuranceType = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+// =============================
+
   apiLoadFinish: boolean = false;
   getPdSupplierFormDetails() {
     this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '4').subscribe(
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
index 622f281b1..b5d90be4a 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -92,14 +92,17 @@
                                 </mat-form-field>
                 
                                 <mat-form-field>
-                                    <mat-select placeholder="Account Type"
+                                    <mat-select placeholder="Account Type" formControlName="account_type">
+                                    <mat-option *ngFor="let prop of m_accountType" [value]="prop.id">{{ prop.name }}</mat-option>
+                                  </mat-select>
+                                    <!--<mat-select placeholder="Account Type"
                                                 formControlName="account_type">
                                         <mat-option value="Savings">Savings</mat-option>
                                         <mat-option value="Current">Current</mat-option>
                                         <mat-option value="OD">OD</mat-option>
                                         <mat-option value="CC">CC</mat-option>
                 
-                                    </mat-select>
+                                    </mat-select>-->
                                 </mat-form-field>
                 
                                 <mat-form-field>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
index f832d64f4..08279586e 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
@@ -32,6 +32,7 @@ export class BankingDetailsComponent implements OnInit {
     public bankingForm: FormGroup;
     step: number;
     private notifier: NotifierService;
+    m_accountType= [];
 
     constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
                 private router: Router,
@@ -43,6 +44,7 @@ export class BankingDetailsComponent implements OnInit {
     ngOnInit() {
         this.step = 0;
         this.initBankingForm();
+        this.getM_AccountType();
         let params: any = {};
         params.pd_id = this.pdid;
         params.pd_form_id = '7';
@@ -68,6 +70,20 @@ export class BankingDetailsComponent implements OnInit {
         });
     }
 
+    // ======================
+
+  getM_AccountType() {
+    this._pd.getAllMasterDatas('ACCOUNTTYPE').subscribe(
+      data => {
+        this.m_accountType = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
     public initBankingForm(): void {
         this.bankingForm = this.fb.group({
             banking_form_remark: [''],
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
index b244be4e3..d7ffad568 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
@@ -62,7 +62,7 @@
                       <div fxFlex="30">
                         <mat-form-field style="width:260px !important;">
                           <mat-select (selectionChange)="selectedFreqPurchase($event)" placeholder="Select Frequency of Purchase" formControlName="frequency_of_purchase">
-                            <mat-option *ngFor="let feq of m_freqOfPurchase" [value]="feq.id">{{ feq.name }}</mat-option>
+                            <mat-option *ngFor="let feq of m_freqOfPurchase" [value]="feq.frequency_id">{{ feq.name }}</mat-option>
                           </mat-select>
                         </mat-form-field>
                       </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
index 674a1dd52..e359094f9 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
@@ -33,64 +33,102 @@ export class SupplierInfoComponent implements OnInit {
 
   public _supplierQuesFrom: FormGroup;
   public submitted = false;
-  public m_paymentModeType= [
-    {
-      'id': "1",
-      'name': 'Immediate Or Advanced Payment'
-    },
-    {
-      'id': "2",
-      'name': 'Credit'
-    },
-    {
-      'id': "3",
-      'name': 'Combination of Both'
-    },
-  ];
 
-  public m_freqOfPurchase= [
-    {
-      'id': "1",
-      'name': 'Daily'
-    },
-    {
-      'id': "2",
-      'name': 'Weekly'
-    },
-    {
-      'id': "3",
-      'name': 'Monthly'
-    },
-    {
-      'id': "4",
-      'name': 'Every 3 months'
-    },
-    {
-      'id': "5",
-      'name': 'Half yearly'
-    },
-    {
-      'id': "6",
-      'name': 'Yearly'
-    },
-    {
-      'id': "7",
-      'name': 'As and when required'
-    },
-    {
-      'id': "8",
-      'name': 'Others'
-    }
-  ]
+public m_paymentModeType= [];
 
+  // public m_paymentModeType= [
+  //   {
+  //     'id': "1",
+  //     'name': 'Immediate Or Advanced Payment'
+  //   },
+  //   {
+  //     'id': "2",
+  //     'name': 'Credit'
+  //   },
+  //   {
+  //     'id': "3",
+  //     'name': 'Combination of Both'
+  //   },
+  // ];
+public m_freqOfPurchase= [];
+  // public m_freqOfPurchase= [
+  //   {
+  //     'id': "1",
+  //     'name': 'Daily'
+  //   },
+  //   {
+  //     'id': "2",
+  //     'name': 'Weekly'
+  //   },
+  //   {
+  //     'id': "3",
+  //     'name': 'Monthly'
+  //   },
+  //   {
+  //     'id': "4",
+  //     'name': 'Every 3 months'
+  //   },
+  //   {
+  //     'id': "5",
+  //     'name': 'Half yearly'
+  //   },
+  //   {
+  //     'id': "6",
+  //     'name': 'Yearly'
+  //   },
+  //   {
+  //     'id': "7",
+  //     'name': 'As and when required'
+  //   },
+  //   {
+  //     'id': "8",
+  //     'name': 'Others'
+  //   }
+  // ]
+
+  private notifier: NotifierService;
   constructor(
+    notifier: NotifierService,
     private _formBuilder: FormBuilder,
-    private pdTrigerService: PdTrigerService) { }
+    private pdTrigerService: PdTrigerService) {
+          this.notifier = notifier;
+     }
 
   ngOnInit() {
-  
+    this.getM_FreqOfPurchase();
+    this.getM_PaymentModeType();
     this.getPdSupplierFormDetails();
   }
+
+// ==================
+
+  getM_FreqOfPurchase() {
+    this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe(
+      data => {
+        this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        // this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+   getM_PaymentModeType() {
+    this.pdTrigerService.getAllMasterDatas('PAYMENTMODE').subscribe(
+      data => {
+        this.m_paymentModeType = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        // this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+
+// ==================
+
 apiLoadFinish: boolean = false;
   getPdSupplierFormDetails() {
     this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '1').subscribe(
@@ -217,22 +255,22 @@ apiLoadFinish: boolean = false;
 
       //To Remove The "Null" With Key also
       Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]);
-      alert(JSON.stringify(answerFormValues));
+      // alert(JSON.stringify(answerFormValues));
       //Add BRANCH data with help Service File
       this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe(
         dataresult => {
           if (dataresult.status == 200) {
             // console.log(dataresult);
-            // this.notifier.notify('success', 'Record Saved Successfully.!');
+            this.notifier.notify('success', 'Record Saved Successfully.!');
             // this.dialogRef.close();
             // alert("sample alert for Saving");
           }
           else {
-            // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+            this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
             // this.errorMessage = "Some Thing Wents Wrong Try Again !";
           }
         }, error => {
-          // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+          this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
           // this.errorMessage = "Something Wents Wrong Try Again !";
           // this.dialogRef.close();
         });
diff --git a/ng6-seed/src/app/template/questions/add/add.component.html b/ng6-seed/src/app/template/questions/add/add.component.html
index 433d85fc7..6e401d019 100644
--- a/ng6-seed/src/app/template/questions/add/add.component.html
+++ b/ng6-seed/src/app/template/questions/add/add.component.html
@@ -1,13 +1,17 @@
 <!--<pre> {{ m_group | json}}</pre>-->
 
-<h2 mat-dialog-title>{{pageTitle}}</h2>
+<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
+    <div fxFlex="80">  <span mat-dialog-title>{{pageTitle}}</span> </div>
+    <div fxFlex="20"><button mat-raised-button mat-icon-button  mat-dialog-close class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above"><mat-icon>close</mat-icon></button></div>      
+  </div>
+
 <mat-dialog-content class="mat-typography">
   <mat-card style="width: 580px; padding: 6px;">
     <form [formGroup]="_addQuesFrom" (submit)="onSubmit()" novalidate>
       <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
-        <div fxFlex="50">
-          <mat-form-field>
-            <mat-select placeholder="Select Category" formControlName="fk_question_category">
+        <div fxFlex="100">
+          <mat-form-field style="width: 100%">
+            <mat-select placeholder="Category" formControlName="fk_question_category">
               <mat-option *ngFor="let ct of categories" [value]="ct.question_category_id">{{ ct.category_name }}</mat-option>
             </mat-select>
             <mat-error *ngIf="submitted && f.fk_question_category.hasError('required')" class="mat-text-warn">You must Select Category.</mat-error>
@@ -39,14 +43,12 @@
         </div>
       </div>
       <div fxLayout="row" fxLayoutAlign="start none">
-        <div>
-          <mat-form-field>
-            <mat-select placeholder="Select Answer Type" formControlName="fk_question_answertype">
+          <mat-form-field style="width: 100%">
+            <mat-select placeholder="Answer Type" formControlName="fk_question_answertype">
               <mat-option *ngFor="let ans of questionsOptions" [value]="ans.question_answer_type_id">{{ ans.answer_type_name }}</mat-option>
             </mat-select>
             <mat-error *ngIf="submitted && f.fk_question_answertype.hasError('required')" class="mat-text-warn">You must Select Answer Type.</mat-error>
-          </mat-form-field>
-        </div>
+          </mat-form-field> 
       </div>
       <div fxLayout="row" fxLayoutAlign="start none">
         <div formArrayName="answers" fxFill>
@@ -64,20 +66,21 @@
                       <mat-option *ngFor="let gp of m_group" [value]="gp.question_group_id">{{ gp.group_name }}</mat-option>
                     </mat-select>
                     </mat-form-field>
-                </div>-->
-                <div fxFlex="20">
+                </div>--> 
+                <div fxFlex="20" style="text-align:right;">
                   <span *ngIf="_addQuesFrom.controls.answers.controls.length > 1" (click)="removeLanguage(i)">
-                     <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
+                     <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
                    </span>
                 </div>
               </div>
             </div>
           </div>
-          <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above"
-            class="mr-1 mb-1 hover-icon" (click)="addLanguage($event); false"><mat-icon>add</mat-icon></button>
-        </div>
+         </div>
       </div>
       <div class="row" style="text-align:right;">
+        <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above"
+        class="mr-1 mb-1 hover-icon" (click)="addLanguage($event); false"><mat-icon>add</mat-icon></button>
+    
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button>
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
       </div>
@@ -85,5 +88,5 @@
   </mat-card>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close>Cancel</button>
+   
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/ng6-seed/src/app/template/questions/edit/edit.component.html b/ng6-seed/src/app/template/questions/edit/edit.component.html
index f39261d1d..fead08903 100644
--- a/ng6-seed/src/app/template/questions/edit/edit.component.html
+++ b/ng6-seed/src/app/template/questions/edit/edit.component.html
@@ -1,12 +1,15 @@
-<h2 mat-dialog-title>{{pageTitle}}</h2>
+<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
+  <div fxFlex="80">  <span mat-dialog-title>{{pageTitle}}</span> </div>
+  <div fxFlex="20"><button mat-raised-button mat-icon-button  mat-dialog-close class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above"><mat-icon>close</mat-icon></button></div>      
+</div> 
 <mat-dialog-content class="mat-typography">
   <mat-card style="width: 580px; padding: 6px;">
     <form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
       <!--<div class="form-group">-->
       <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
-        <div fxFlex="50">
-          <mat-form-field>
-            <mat-select placeholder="Select Category" formControlName="fk_question_category">
+        <div fxFlex="100" >
+          <mat-form-field style="width: 100%">
+            <mat-select placeholder="Category" formControlName="fk_question_category">
               <mat-option *ngFor="let ct of categories" [value]="ct.question_category_id">{{ ct.category_name }}</mat-option>
             </mat-select>
             <mat-error *ngIf="submitted && f.fk_question_category.hasError('required')" class="mat-text-warn">You must Select Category.</mat-error>
@@ -37,15 +40,13 @@
           </mat-form-field>
         </div>
       </div>
-      <div fxLayout="row" fxLayoutAlign="start none">
-        <div>
-          <mat-form-field>
-            <mat-select placeholder="Select Answer Type" formControlName="fk_question_answertype">
+      <div fxLayout="row" fxLayoutAlign="start none"> 
+          <mat-form-field style="width: 100%">
+            <mat-select placeholder="Answer Type" formControlName="fk_question_answertype">
               <mat-option *ngFor="let ans of questionsOptions" [value]="ans.question_answer_type_id">{{ ans.answer_type_name }}</mat-option>
             </mat-select>
             <mat-error *ngIf="submitted && f.fk_question_answertype.hasError('required')" class="mat-text-warn">You must Select Answer Type.</mat-error>
-          </mat-form-field>
-        </div>
+          </mat-form-field> 
       </div>
       <div fxLayout="row" fxLayoutAlign="start none">
         <!--<mat-checkbox formControlName="isactive" [ngModel]="f.isactive.value === 1 ? true : false"
@@ -64,25 +65,23 @@
                     <!--<mat-error *ngIf="submitted && answer.hasError('required')" class="mat-text-warn">You must Include Question.</mat-error>-->
                   </mat-form-field>
                 </div>
-                <div fxFlex="30">
-                  <mat-form-field>
-                    <mat-select placeholder="Select Group" formControlName="fk_question_group_id">
+                <!----<div fxFlex="30">
+                  <mat-form-field style="margin-top: 7%;">
+                    <mat-select placeholder="Group" formControlName="fk_question_group_id">
                       <mat-option *ngFor="let gp of m_group" [value]="gp.question_group_id">{{ gp.group_name }}</mat-option>
                     </mat-select>
                   </mat-form-field>
-                </div>
-                <div fxFlex="20">
+                </div>-->
+                <div fxFlex="20" style="text-align:right;">
                   <mat-checkbox *ngIf="answ.get('question_answer_id').value != null" formControlName="isactive" [ngModel]="answ.get('isactive').value == 1 ? true : answ.get('isactive').value == 0 ? false : null"
                     (ngModelChange)="answ.get('isactive').value = $event ? 1 : 0"></mat-checkbox>
                   <span *ngIf="_addQuesFrom.controls.answers.controls.length > 1" (click)="removeLanguage(i)">
-                     <button *ngIf="answ.get('question_answer_id').value == null" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
+                     <button *ngIf="answ.get('question_answer_id').value == null"  mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
                     </span>
                 </div>
               </div>
             </div>
           </div>
-          <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above"
-            class="mr-1 mb-1 hover-icon" (click)="addLanguage(null, null, null, null, $event); false"><mat-icon>add</mat-icon></button>
           <!-- <button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage(null, null, null, $event); false">Add More</button> -->
           <!--<a (click)="addLanguage()" style="cursor: default">Add another Answer </a>-->
         </div>
@@ -94,6 +93,9 @@
         </li>
       </ul>-->
       <div class="row" style="text-align:right;">
+        <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above"
+        class="mr-1 mb-1 hover-icon" (click)="addLanguage(null, null, null, null, $event); false"><mat-icon>add</mat-icon></button>
+     
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button"
           (click)="onReset()"><mat-icon>settings_backup_restore</mat-icon></button>
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
@@ -103,6 +105,6 @@
   </mat-card>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close>Cancel</button>
-</mat-dialog-actions>
-<notifier-container></notifier-container>
\ No newline at end of file
+   
+  </mat-dialog-actions>
+ 
\ No newline at end of file