Modified to integrate borrower ui with server code
Modified to integrate borrower ui with server code
Resolved conflict