Merge pull request #67 from g2-aj/branch_alshahna

Branch alshahna
Fixed multiple windows popping up on button presses for Borrower menu
Merge pull request #68 from g2-aj/g3-ks

Fixed multiple windows popping up on button presses for Borrower menu
gui change
manual merge