Beneficiary Search UI update, not completed yet