diff --git a/src/app/list-income/list-income.component.ts b/src/app/list-income/list-income.component.ts
index 3e80720..a20b5d8 100644
--- a/src/app/list-income/list-income.component.ts
+++ b/src/app/list-income/list-income.component.ts
@@ -12,7 +12,7 @@ import {LoanSingleService} from '../service/loan.single.service';
 export class ListIncomeComponent implements OnInit {
   public uploadMeta: UploadMetaModel = new UploadMetaModel({});
   public Loan: LoanModel = new LoanModel({});
-  public startLoad = false
+  public startLoad = false;
 
   private UploadMetaFilterIsReady = false;
   private LoanFilterIsReady = false;
@@ -53,6 +53,6 @@ export class ListIncomeComponent implements OnInit {
   }
 
   private checkStartUpload(): void {
-     this.startLoad = this.UploadMetaFilterIsReady
+     this.startLoad = this.UploadMetaFilterIsReady && this.LoanFilterIsReady;
   }
 }
diff --git a/src/app/loan-card/loan-card.component.html b/src/app/loan-card/loan-card.component.html
index cc52765..82c04b7 100644
--- a/src/app/loan-card/loan-card.component.html
+++ b/src/app/loan-card/loan-card.component.html
@@ -1,4 +1,4 @@
-<div class="card loan" (click)="onClick()">
+<div class="card loan" (click)="onClick()" *ngIf="Loan!==undefined">
   <span class="badge badge-success">{{Loan.Item}}</span>
   <span> Amount: {{Loan.Amount | currency }}</span>
   <span> Settlement: {{Loan.Settlement | date:'yyyy-mm-dd' }}</span>
diff --git a/src/app/loan-select/loan-select.component.html b/src/app/loan-select/loan-select.component.html
index c3137e7..94c954a 100644
--- a/src/app/loan-select/loan-select.component.html
+++ b/src/app/loan-select/loan-select.component.html
@@ -4,7 +4,7 @@
                  [Loan]="Loan" [ShowCloseButton]="false"></app-loan-card>
 </div>
 
-<kendo-popup [anchor]="anchor" [offset]="Offset" (anchorViewportLeave)="showPopup = false" *ngIf="showPopup">
+<kendo-popup [offset]="Offset" (anchorViewportLeave)="showPopup = false" *ngIf="showPopup">
   <div class='popup-content'>
     <app-list-all-loans #list
                         (LoanSelected)="onLoanSelected($event)"
diff --git a/src/app/loan-select/loan-select.component.scss b/src/app/loan-select/loan-select.component.scss
index 664d0e7..ff15467 100644
--- a/src/app/loan-select/loan-select.component.scss
+++ b/src/app/loan-select/loan-select.component.scss
@@ -1,8 +1,8 @@
 .popup-content {
   box-shadow: 1px 1px 10px black;
   padding: 10px;
-  width: 90vw;
-  height: 50vw;
+  width: calc(100vw - 20px);
+  height:calc(100vh - 96px);
   color: #787878;
   background-color: #fcf7f8;
   border: 1px solid rgba(0,0,0,.05);
diff --git a/src/app/loan-select/loan-select.component.ts b/src/app/loan-select/loan-select.component.ts
index 1948115..088679a 100644
--- a/src/app/loan-select/loan-select.component.ts
+++ b/src/app/loan-select/loan-select.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, ViewChild} from '@angular/core';
+import {Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
 import {LoanModel} from '../models/loan.model';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {ListAllLoansComponent} from '../list-all-loans/list-all-loans.component';
@@ -19,11 +19,12 @@ export class LoanSelectComponent implements OnInit, ControlValueAccessor {
   @ViewChild('list', {static: false} ) list: ListAllLoansComponent;
   @Input() Max = 1; // we do not support multiple loan selection at the moment
   @Input() readOnly = false;
+  @Output() valueChange: EventEmitter<LoanModel> = new EventEmitter<LoanModel>();
   public Loan: LoanModel; // for multiple selection ,it has to be array; we don't support it now.
 
   // popup
   public showPopup = false;
-  public Offset = { left: 0, top: 0 };
+  public Offset = { left: 10, top: 48 };
 
   // formControl state
   private disabled = false;
@@ -59,10 +60,15 @@ export class LoanSelectComponent implements OnInit, ControlValueAccessor {
   }
 
   onLoanSelected(loan: LoanModel): void {
+    if (this.Loan.Id !== loan.Id){
+      this.valueChange.emit(loan);
+      this.onChange(loan);
+      this.Loan = loan;
+    }
     this.Loan = loan;
     this.markAsTouched();
     this.onTouched();
-    this.onChange(loan);
+
     this.showPopup = false;
   }
 
diff --git a/src/app/pay-in/pay-in.component.html b/src/app/pay-in/pay-in.component.html
index 96b186b..3aeeff9 100644
--- a/src/app/pay-in/pay-in.component.html
+++ b/src/app/pay-in/pay-in.component.html
@@ -129,10 +129,10 @@
                      [editable]="true "
                      [sortable]="false">
     <ng-template kendoGridCellTemplate let-dataItem>
-      <app-loan-card *ngIf="dataItem.LoanId !== '' " [LoanId]="dataItem.LoanId"></app-loan-card>
+      <app-loan-card *ngIf="dataItem.LoanId !== '' " [Loan]="dataItem.Loan"></app-loan-card>
     </ng-template>
     <ng-template kendoGridEditTemplate let-dataItem>
-      <app-loan-select [formControl]="incomeFormGroup.get('Loan')"
+      <app-loan-select [formControl]="incomeFormGroup.get('Loan')" (valueChange)="onLoanChange($event)"
                        [readOnly]="this.filterLoan !== undefined && this.filterLoan.Id !==''"
       ></app-loan-select>
     </ng-template>
diff --git a/src/app/pay-in/pay-in.component.ts b/src/app/pay-in/pay-in.component.ts
index ff1c0f8..07d4868 100644
--- a/src/app/pay-in/pay-in.component.ts
+++ b/src/app/pay-in/pay-in.component.ts
@@ -53,7 +53,10 @@ export class PayInComponent implements OnInit {
   constructor(private pis: PayInService, private lss: LoanSingleService, private router: Router) { }
 
   ngOnInit(): void {
-    this.debouncedLoadFilteredData = debounce(this.loadFilteredData, 100);
+    this.debouncedLoadFilteredData = debounce(this.loadFilteredData, 500);
+    if (this.privateLoadDataNow) { // not in delayed loading mode
+      this.debouncedLoadFilteredData();
+    }
   }
 
   public loadFilteredData(): void{
@@ -107,10 +110,11 @@ export class PayInComponent implements OnInit {
   }
 
   @Input()  set LoadDataNow( value: boolean) {
-    this.privateLoadDataNow = value;
-    if ( value === true ) {
+
+    if ( value === true && this.privateLoadDataNow === false) {
       this.debouncedLoadFilteredData();
     }
+    this.privateLoadDataNow = value;
   }
   get LoadDataNow(): boolean {
     return this.privateLoadDataNow;
@@ -172,9 +176,9 @@ export class PayInComponent implements OnInit {
 
     const pi = this.buildPayInForSave(v, isNew);
     this.lss.savePayIn(pi, isNew).subscribe(
-      (resp: PayInModel) => {
-        this.Loan.cuPayIn(resp);
-        this.updatePiInGrid(new PayInModel(resp));
+      (resp: PayInModelEx) => {
+        this.Loan.cuPayIn( new PayInModel(resp));
+        this.updatePiInGrid(new PayInModelEx(resp));
       },
       err => {
         // TODO: this.errorOccurred.emit('Error saving Income');
@@ -288,4 +292,11 @@ export class PayInComponent implements OnInit {
     this.filter.Sort = sort;
     this.loadFilteredData();
   }
+
+  public onLoanChange(loan: LoanModel): void {
+    if ( loan.Id !== '' ) {
+      this.incomeFormGroup.get('Lender').setValue(loan.Lender);
+      this.incomeFormGroup.get('Lender').disable({onlySelf: true, emitEvent: false});
+    }
+  }
 }
diff --git a/src/app/service/loan.single.service.ts b/src/app/service/loan.single.service.ts
index 45054a0..57b7bb8 100644
--- a/src/app/service/loan.single.service.ts
+++ b/src/app/service/loan.single.service.ts
@@ -6,6 +6,7 @@ import {Injectable} from '@angular/core';
 import {RewardModel} from '../models/reward.model';
 import {ClonerService} from './clone.service';
 import {PayInModel} from '../models/pay-in.model';
+import {PayInModelEx} from '../models/pay-in-ex.model';
 
 @Injectable()
 export class LoanSingleService {
@@ -37,8 +38,8 @@ export class LoanSingleService {
     );
   }
 
-  public savePayIn(payIn: PayInModel, isNew: boolean): Observable<PayInModel> {
-    return this.http.post<PayInModel>(this.auth.getUrl('payIn/'), payIn);
+  public savePayIn(payIn: PayInModel, isNew: boolean): Observable<PayInModelEx> {
+    return this.http.post<PayInModelEx>(this.auth.getUrl('payIn/'), payIn);
   }
 
   public removePayIn(id: number): void {